mirror of
https://git.suyu.dev/suyu/suyu.git
synced 2024-11-29 23:06:23 -05:00
video_core: Move morton functions to their own file
This commit is contained in:
ReinUsesLisp
parent
f7a1827aaa
commit
dad3a6718e
6 changed files with 391 additions and 345 deletions
|
|
@ -21,6 +21,8 @@ add_library(video_core STATIC
|
||||||
macro_interpreter.h
|
macro_interpreter.h
|
||||||
memory_manager.cpp
|
memory_manager.cpp
|
||||||
memory_manager.h
|
memory_manager.h
|
||||||
|
morton.cpp
|
||||||
|
morton.h
|
||||||
rasterizer_cache.cpp
|
rasterizer_cache.cpp
|
||||||
rasterizer_cache.h
|
rasterizer_cache.h
|
||||||
rasterizer_interface.h
|
rasterizer_interface.h
|
||||||
|
|
@ -62,7 +64,6 @@ add_library(video_core STATIC
|
||||||
textures/decoders.cpp
|
textures/decoders.cpp
|
||||||
textures/decoders.h
|
textures/decoders.h
|
||||||
textures/texture.h
|
textures/texture.h
|
||||||
utils.h
|
|
||||||
video_core.cpp
|
video_core.cpp
|
||||||
video_core.h
|
video_core.h
|
||||||
)
|
)
|
||||||
|
|
|
||||||
353
src/video_core/morton.cpp
Normal file
353
src/video_core/morton.cpp
Normal file
|
|
@ -0,0 +1,353 @@
|
||||||
|
// Copyright 2018 yuzu Emulator Project
|
||||||
|
// Licensed under GPLv2 or any later version
|
||||||
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#include <array>
|
||||||
|
#include <cstring>
|
||||||
|
#include "common/assert.h"
|
||||||
|
#include "common/common_types.h"
|
||||||
|
#include "core/memory.h"
|
||||||
|
#include "video_core/morton.h"
|
||||||
|
#include "video_core/surface.h"
|
||||||
|
#include "video_core/textures/decoders.h"
|
||||||
|
|
||||||
|
namespace VideoCore {
|
||||||
|
|
||||||
|
using Surface::GetBytesPerPixel;
|
||||||
|
using Surface::PixelFormat;
|
||||||
|
|
||||||
|
using MortonCopyFn = void (*)(u32, u32, u32, u32, u32, u8*, std::size_t, VAddr);
|
||||||
|
using ConversionArray = std::array<MortonCopyFn, Surface::MaxPixelFormat>;
|
||||||
|
|
||||||
|
template <bool morton_to_linear, PixelFormat format>
|
||||||
|
static void MortonCopy(u32 stride, u32 block_height, u32 height, u32 block_depth, u32 depth,
|
||||||
|
u8* buffer, std::size_t buffer_size, VAddr addr) {
|
||||||
|
constexpr u32 bytes_per_pixel = GetBytesPerPixel(format);
|
||||||
|
|
||||||
|
// With the BCn formats (DXT and DXN), each 4x4 tile is swizzled instead of just individual
|
||||||
|
// pixel values.
|
||||||
|
const u32 tile_size_x{GetDefaultBlockWidth(format)};
|
||||||
|
const u32 tile_size_y{GetDefaultBlockHeight(format)};
|
||||||
|
|
||||||
|
if (morton_to_linear) {
|
||||||
|
Tegra::Texture::UnswizzleTexture(buffer, addr, tile_size_x, tile_size_y, bytes_per_pixel,
|
||||||
|
stride, height, depth, block_height, block_depth);
|
||||||
|
} else {
|
||||||
|
Tegra::Texture::CopySwizzledData((stride + tile_size_x - 1) / tile_size_x,
|
||||||
|
(height + tile_size_y - 1) / tile_size_y, depth,
|
||||||
|
bytes_per_pixel, bytes_per_pixel, Memory::GetPointer(addr),
|
||||||
|
buffer, false, block_height, block_depth);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static constexpr ConversionArray morton_to_linear_fns = {
|
||||||
|
// clang-format off
|
||||||
|
MortonCopy<true, PixelFormat::ABGR8U>,
|
||||||
|
MortonCopy<true, PixelFormat::ABGR8S>,
|
||||||
|
MortonCopy<true, PixelFormat::ABGR8UI>,
|
||||||
|
MortonCopy<true, PixelFormat::B5G6R5U>,
|
||||||
|
MortonCopy<true, PixelFormat::A2B10G10R10U>,
|
||||||
|
MortonCopy<true, PixelFormat::A1B5G5R5U>,
|
||||||
|
MortonCopy<true, PixelFormat::R8U>,
|
||||||
|
MortonCopy<true, PixelFormat::R8UI>,
|
||||||
|
MortonCopy<true, PixelFormat::RGBA16F>,
|
||||||
|
MortonCopy<true, PixelFormat::RGBA16U>,
|
||||||
|
MortonCopy<true, PixelFormat::RGBA16UI>,
|
||||||
|
MortonCopy<true, PixelFormat::R11FG11FB10F>,
|
||||||
|
MortonCopy<true, PixelFormat::RGBA32UI>,
|
||||||
|
MortonCopy<true, PixelFormat::DXT1>,
|
||||||
|
MortonCopy<true, PixelFormat::DXT23>,
|
||||||
|
MortonCopy<true, PixelFormat::DXT45>,
|
||||||
|
MortonCopy<true, PixelFormat::DXN1>,
|
||||||
|
MortonCopy<true, PixelFormat::DXN2UNORM>,
|
||||||
|
MortonCopy<true, PixelFormat::DXN2SNORM>,
|
||||||
|
MortonCopy<true, PixelFormat::BC7U>,
|
||||||
|
MortonCopy<true, PixelFormat::BC6H_UF16>,
|
||||||
|
MortonCopy<true, PixelFormat::BC6H_SF16>,
|
||||||
|
MortonCopy<true, PixelFormat::ASTC_2D_4X4>,
|
||||||
|
MortonCopy<true, PixelFormat::G8R8U>,
|
||||||
|
MortonCopy<true, PixelFormat::G8R8S>,
|
||||||
|
MortonCopy<true, PixelFormat::BGRA8>,
|
||||||
|
MortonCopy<true, PixelFormat::RGBA32F>,
|
||||||
|
MortonCopy<true, PixelFormat::RG32F>,
|
||||||
|
MortonCopy<true, PixelFormat::R32F>,
|
||||||
|
MortonCopy<true, PixelFormat::R16F>,
|
||||||
|
MortonCopy<true, PixelFormat::R16U>,
|
||||||
|
MortonCopy<true, PixelFormat::R16S>,
|
||||||
|
MortonCopy<true, PixelFormat::R16UI>,
|
||||||
|
MortonCopy<true, PixelFormat::R16I>,
|
||||||
|
MortonCopy<true, PixelFormat::RG16>,
|
||||||
|
MortonCopy<true, PixelFormat::RG16F>,
|
||||||
|
MortonCopy<true, PixelFormat::RG16UI>,
|
||||||
|
MortonCopy<true, PixelFormat::RG16I>,
|
||||||
|
MortonCopy<true, PixelFormat::RG16S>,
|
||||||
|
MortonCopy<true, PixelFormat::RGB32F>,
|
||||||
|
MortonCopy<true, PixelFormat::RGBA8_SRGB>,
|
||||||
|
MortonCopy<true, PixelFormat::RG8U>,
|
||||||
|
MortonCopy<true, PixelFormat::RG8S>,
|
||||||
|
MortonCopy<true, PixelFormat::RG32UI>,
|
||||||
|
MortonCopy<true, PixelFormat::R32UI>,
|
||||||
|
MortonCopy<true, PixelFormat::ASTC_2D_8X8>,
|
||||||
|
MortonCopy<true, PixelFormat::ASTC_2D_8X5>,
|
||||||
|
MortonCopy<true, PixelFormat::ASTC_2D_5X4>,
|
||||||
|
MortonCopy<true, PixelFormat::BGRA8_SRGB>,
|
||||||
|
MortonCopy<true, PixelFormat::DXT1_SRGB>,
|
||||||
|
MortonCopy<true, PixelFormat::DXT23_SRGB>,
|
||||||
|
MortonCopy<true, PixelFormat::DXT45_SRGB>,
|
||||||
|
MortonCopy<true, PixelFormat::BC7U_SRGB>,
|
||||||
|
MortonCopy<true, PixelFormat::ASTC_2D_4X4_SRGB>,
|
||||||
|
MortonCopy<true, PixelFormat::ASTC_2D_8X8_SRGB>,
|
||||||
|
MortonCopy<true, PixelFormat::ASTC_2D_8X5_SRGB>,
|
||||||
|
MortonCopy<true, PixelFormat::ASTC_2D_5X4_SRGB>,
|
||||||
|
MortonCopy<true, PixelFormat::ASTC_2D_5X5>,
|
||||||
|
MortonCopy<true, PixelFormat::ASTC_2D_5X5_SRGB>,
|
||||||
|
MortonCopy<true, PixelFormat::ASTC_2D_10X8>,
|
||||||
|
MortonCopy<true, PixelFormat::ASTC_2D_10X8_SRGB>,
|
||||||
|
MortonCopy<true, PixelFormat::Z32F>,
|
||||||
|
MortonCopy<true, PixelFormat::Z16>,
|
||||||
|
MortonCopy<true, PixelFormat::Z24S8>,
|
||||||
|
MortonCopy<true, PixelFormat::S8Z24>,
|
||||||
|
MortonCopy<true, PixelFormat::Z32FS8>,
|
||||||
|
// clang-format on
|
||||||
|
};
|
||||||
|
|
||||||
|
static constexpr ConversionArray linear_to_morton_fns = {
|
||||||
|
// clang-format off
|
||||||
|
MortonCopy<false, PixelFormat::ABGR8U>,
|
||||||
|
MortonCopy<false, PixelFormat::ABGR8S>,
|
||||||
|
MortonCopy<false, PixelFormat::ABGR8UI>,
|
||||||
|
MortonCopy<false, PixelFormat::B5G6R5U>,
|
||||||
|
MortonCopy<false, PixelFormat::A2B10G10R10U>,
|
||||||
|
MortonCopy<false, PixelFormat::A1B5G5R5U>,
|
||||||
|
MortonCopy<false, PixelFormat::R8U>,
|
||||||
|
MortonCopy<false, PixelFormat::R8UI>,
|
||||||
|
MortonCopy<false, PixelFormat::RGBA16F>,
|
||||||
|
MortonCopy<false, PixelFormat::RGBA16U>,
|
||||||
|
MortonCopy<false, PixelFormat::RGBA16UI>,
|
||||||
|
MortonCopy<false, PixelFormat::R11FG11FB10F>,
|
||||||
|
MortonCopy<false, PixelFormat::RGBA32UI>,
|
||||||
|
MortonCopy<false, PixelFormat::DXT1>,
|
||||||
|
MortonCopy<false, PixelFormat::DXT23>,
|
||||||
|
MortonCopy<false, PixelFormat::DXT45>,
|
||||||
|
MortonCopy<false, PixelFormat::DXN1>,
|
||||||
|
MortonCopy<false, PixelFormat::DXN2UNORM>,
|
||||||
|
MortonCopy<false, PixelFormat::DXN2SNORM>,
|
||||||
|
MortonCopy<false, PixelFormat::BC7U>,
|
||||||
|
MortonCopy<false, PixelFormat::BC6H_UF16>,
|
||||||
|
MortonCopy<false, PixelFormat::BC6H_SF16>,
|
||||||
|
// TODO(Subv): Swizzling ASTC formats are not supported
|
||||||
|
nullptr,
|
||||||
|
MortonCopy<false, PixelFormat::G8R8U>,
|
||||||
|
MortonCopy<false, PixelFormat::G8R8S>,
|
||||||
|
MortonCopy<false, PixelFormat::BGRA8>,
|
||||||
|
MortonCopy<false, PixelFormat::RGBA32F>,
|
||||||
|
MortonCopy<false, PixelFormat::RG32F>,
|
||||||
|
MortonCopy<false, PixelFormat::R32F>,
|
||||||
|
MortonCopy<false, PixelFormat::R16F>,
|
||||||
|
MortonCopy<false, PixelFormat::R16U>,
|
||||||
|
MortonCopy<false, PixelFormat::R16S>,
|
||||||
|
MortonCopy<false, PixelFormat::R16UI>,
|
||||||
|
MortonCopy<false, PixelFormat::R16I>,
|
||||||
|
MortonCopy<false, PixelFormat::RG16>,
|
||||||
|
MortonCopy<false, PixelFormat::RG16F>,
|
||||||
|
MortonCopy<false, PixelFormat::RG16UI>,
|
||||||
|
MortonCopy<false, PixelFormat::RG16I>,
|
||||||
|
MortonCopy<false, PixelFormat::RG16S>,
|
||||||
|
MortonCopy<false, PixelFormat::RGB32F>,
|
||||||
|
MortonCopy<false, PixelFormat::RGBA8_SRGB>,
|
||||||
|
MortonCopy<false, PixelFormat::RG8U>,
|
||||||
|
MortonCopy<false, PixelFormat::RG8S>,
|
||||||
|
MortonCopy<false, PixelFormat::RG32UI>,
|
||||||
|
MortonCopy<false, PixelFormat::R32UI>,
|
||||||
|
nullptr,
|
||||||
|
nullptr,
|
||||||
|
nullptr,
|
||||||
|
MortonCopy<false, PixelFormat::BGRA8_SRGB>,
|
||||||
|
MortonCopy<false, PixelFormat::DXT1_SRGB>,
|
||||||
|
MortonCopy<false, PixelFormat::DXT23_SRGB>,
|
||||||
|
MortonCopy<false, PixelFormat::DXT45_SRGB>,
|
||||||
|
MortonCopy<false, PixelFormat::BC7U_SRGB>,
|
||||||
|
nullptr,
|
||||||
|
nullptr,
|
||||||
|
nullptr,
|
||||||
|
nullptr,
|
||||||
|
nullptr,
|
||||||
|
nullptr,
|
||||||
|
nullptr,
|
||||||
|
nullptr,
|
||||||
|
MortonCopy<false, PixelFormat::Z32F>,
|
||||||
|
MortonCopy<false, PixelFormat::Z16>,
|
||||||
|
MortonCopy<false, PixelFormat::Z24S8>,
|
||||||
|
MortonCopy<false, PixelFormat::S8Z24>,
|
||||||
|
MortonCopy<false, PixelFormat::Z32FS8>,
|
||||||
|
// clang-format on
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr MortonCopyFn GetSwizzleFunction(MortonSwizzleMode mode, Surface::PixelFormat format) {
|
||||||
|
switch (mode) {
|
||||||
|
case MortonSwizzleMode::MortonToLinear:
|
||||||
|
return morton_to_linear_fns[static_cast<std::size_t>(format)];
|
||||||
|
case MortonSwizzleMode::LinearToMorton:
|
||||||
|
return linear_to_morton_fns[static_cast<std::size_t>(format)];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 8x8 Z-Order coordinate from 2D coordinates
|
||||||
|
static u32 MortonInterleave(u32 x, u32 y) {
|
||||||
|
static const u32 xlut[] = {0x00, 0x01, 0x04, 0x05, 0x10, 0x11, 0x14, 0x15};
|
||||||
|
static const u32 ylut[] = {0x00, 0x02, 0x08, 0x0a, 0x20, 0x22, 0x28, 0x2a};
|
||||||
|
return xlut[x % 8] + ylut[y % 8];
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Calculates the offset of the position of the pixel in Morton order
|
||||||
|
static u32 GetMortonOffset(u32 x, u32 y, u32 bytes_per_pixel) {
|
||||||
|
// Images are split into 8x8 tiles. Each tile is composed of four 4x4 subtiles each
|
||||||
|
// of which is composed of four 2x2 subtiles each of which is composed of four texels.
|
||||||
|
// Each structure is embedded into the next-bigger one in a diagonal pattern, e.g.
|
||||||
|
// texels are laid out in a 2x2 subtile like this:
|
||||||
|
// 2 3
|
||||||
|
// 0 1
|
||||||
|
//
|
||||||
|
// The full 8x8 tile has the texels arranged like this:
|
||||||
|
//
|
||||||
|
// 42 43 46 47 58 59 62 63
|
||||||
|
// 40 41 44 45 56 57 60 61
|
||||||
|
// 34 35 38 39 50 51 54 55
|
||||||
|
// 32 33 36 37 48 49 52 53
|
||||||
|
// 10 11 14 15 26 27 30 31
|
||||||
|
// 08 09 12 13 24 25 28 29
|
||||||
|
// 02 03 06 07 18 19 22 23
|
||||||
|
// 00 01 04 05 16 17 20 21
|
||||||
|
//
|
||||||
|
// This pattern is what's called Z-order curve, or Morton order.
|
||||||
|
|
||||||
|
const unsigned int block_height = 8;
|
||||||
|
const unsigned int coarse_x = x & ~7;
|
||||||
|
|
||||||
|
u32 i = MortonInterleave(x, y);
|
||||||
|
|
||||||
|
const unsigned int offset = coarse_x * block_height;
|
||||||
|
|
||||||
|
return (i + offset) * bytes_per_pixel;
|
||||||
|
}
|
||||||
|
|
||||||
|
static u32 MortonInterleave128(u32 x, u32 y) {
|
||||||
|
// 128x128 Z-Order coordinate from 2D coordinates
|
||||||
|
static constexpr u32 xlut[] = {
|
||||||
|
0x0000, 0x0001, 0x0002, 0x0003, 0x0008, 0x0009, 0x000a, 0x000b, 0x0040, 0x0041, 0x0042,
|
||||||
|
0x0043, 0x0048, 0x0049, 0x004a, 0x004b, 0x0800, 0x0801, 0x0802, 0x0803, 0x0808, 0x0809,
|
||||||
|
0x080a, 0x080b, 0x0840, 0x0841, 0x0842, 0x0843, 0x0848, 0x0849, 0x084a, 0x084b, 0x1000,
|
||||||
|
0x1001, 0x1002, 0x1003, 0x1008, 0x1009, 0x100a, 0x100b, 0x1040, 0x1041, 0x1042, 0x1043,
|
||||||
|
0x1048, 0x1049, 0x104a, 0x104b, 0x1800, 0x1801, 0x1802, 0x1803, 0x1808, 0x1809, 0x180a,
|
||||||
|
0x180b, 0x1840, 0x1841, 0x1842, 0x1843, 0x1848, 0x1849, 0x184a, 0x184b, 0x2000, 0x2001,
|
||||||
|
0x2002, 0x2003, 0x2008, 0x2009, 0x200a, 0x200b, 0x2040, 0x2041, 0x2042, 0x2043, 0x2048,
|
||||||
|
0x2049, 0x204a, 0x204b, 0x2800, 0x2801, 0x2802, 0x2803, 0x2808, 0x2809, 0x280a, 0x280b,
|
||||||
|
0x2840, 0x2841, 0x2842, 0x2843, 0x2848, 0x2849, 0x284a, 0x284b, 0x3000, 0x3001, 0x3002,
|
||||||
|
0x3003, 0x3008, 0x3009, 0x300a, 0x300b, 0x3040, 0x3041, 0x3042, 0x3043, 0x3048, 0x3049,
|
||||||
|
0x304a, 0x304b, 0x3800, 0x3801, 0x3802, 0x3803, 0x3808, 0x3809, 0x380a, 0x380b, 0x3840,
|
||||||
|
0x3841, 0x3842, 0x3843, 0x3848, 0x3849, 0x384a, 0x384b, 0x0000, 0x0001, 0x0002, 0x0003,
|
||||||
|
0x0008, 0x0009, 0x000a, 0x000b, 0x0040, 0x0041, 0x0042, 0x0043, 0x0048, 0x0049, 0x004a,
|
||||||
|
0x004b, 0x0800, 0x0801, 0x0802, 0x0803, 0x0808, 0x0809, 0x080a, 0x080b, 0x0840, 0x0841,
|
||||||
|
0x0842, 0x0843, 0x0848, 0x0849, 0x084a, 0x084b, 0x1000, 0x1001, 0x1002, 0x1003, 0x1008,
|
||||||
|
0x1009, 0x100a, 0x100b, 0x1040, 0x1041, 0x1042, 0x1043, 0x1048, 0x1049, 0x104a, 0x104b,
|
||||||
|
0x1800, 0x1801, 0x1802, 0x1803, 0x1808, 0x1809, 0x180a, 0x180b, 0x1840, 0x1841, 0x1842,
|
||||||
|
0x1843, 0x1848, 0x1849, 0x184a, 0x184b, 0x2000, 0x2001, 0x2002, 0x2003, 0x2008, 0x2009,
|
||||||
|
0x200a, 0x200b, 0x2040, 0x2041, 0x2042, 0x2043, 0x2048, 0x2049, 0x204a, 0x204b, 0x2800,
|
||||||
|
0x2801, 0x2802, 0x2803, 0x2808, 0x2809, 0x280a, 0x280b, 0x2840, 0x2841, 0x2842, 0x2843,
|
||||||
|
0x2848, 0x2849, 0x284a, 0x284b, 0x3000, 0x3001, 0x3002, 0x3003, 0x3008, 0x3009, 0x300a,
|
||||||
|
0x300b, 0x3040, 0x3041, 0x3042, 0x3043, 0x3048, 0x3049, 0x304a, 0x304b, 0x3800, 0x3801,
|
||||||
|
0x3802, 0x3803, 0x3808, 0x3809, 0x380a, 0x380b, 0x3840, 0x3841, 0x3842, 0x3843, 0x3848,
|
||||||
|
0x3849, 0x384a, 0x384b, 0x0000, 0x0001, 0x0002, 0x0003, 0x0008, 0x0009, 0x000a, 0x000b,
|
||||||
|
0x0040, 0x0041, 0x0042, 0x0043, 0x0048, 0x0049, 0x004a, 0x004b, 0x0800, 0x0801, 0x0802,
|
||||||
|
0x0803, 0x0808, 0x0809, 0x080a, 0x080b, 0x0840, 0x0841, 0x0842, 0x0843, 0x0848, 0x0849,
|
||||||
|
0x084a, 0x084b, 0x1000, 0x1001, 0x1002, 0x1003, 0x1008, 0x1009, 0x100a, 0x100b, 0x1040,
|
||||||
|
0x1041, 0x1042, 0x1043, 0x1048, 0x1049, 0x104a, 0x104b, 0x1800, 0x1801, 0x1802, 0x1803,
|
||||||
|
0x1808, 0x1809, 0x180a, 0x180b, 0x1840, 0x1841, 0x1842, 0x1843, 0x1848, 0x1849, 0x184a,
|
||||||
|
0x184b, 0x2000, 0x2001, 0x2002, 0x2003, 0x2008, 0x2009, 0x200a, 0x200b, 0x2040, 0x2041,
|
||||||
|
0x2042, 0x2043, 0x2048, 0x2049, 0x204a, 0x204b, 0x2800, 0x2801, 0x2802, 0x2803, 0x2808,
|
||||||
|
0x2809, 0x280a, 0x280b, 0x2840, 0x2841, 0x2842, 0x2843, 0x2848, 0x2849, 0x284a, 0x284b,
|
||||||
|
0x3000, 0x3001, 0x3002, 0x3003, 0x3008, 0x3009, 0x300a, 0x300b, 0x3040, 0x3041, 0x3042,
|
||||||
|
0x3043, 0x3048, 0x3049, 0x304a, 0x304b, 0x3800, 0x3801, 0x3802, 0x3803, 0x3808, 0x3809,
|
||||||
|
0x380a, 0x380b, 0x3840, 0x3841, 0x3842, 0x3843, 0x3848, 0x3849, 0x384a, 0x384b,
|
||||||
|
};
|
||||||
|
static constexpr u32 ylut[] = {
|
||||||
|
0x0000, 0x0004, 0x0010, 0x0014, 0x0020, 0x0024, 0x0030, 0x0034, 0x0080, 0x0084, 0x0090,
|
||||||
|
0x0094, 0x00a0, 0x00a4, 0x00b0, 0x00b4, 0x0100, 0x0104, 0x0110, 0x0114, 0x0120, 0x0124,
|
||||||
|
0x0130, 0x0134, 0x0180, 0x0184, 0x0190, 0x0194, 0x01a0, 0x01a4, 0x01b0, 0x01b4, 0x0200,
|
||||||
|
0x0204, 0x0210, 0x0214, 0x0220, 0x0224, 0x0230, 0x0234, 0x0280, 0x0284, 0x0290, 0x0294,
|
||||||
|
0x02a0, 0x02a4, 0x02b0, 0x02b4, 0x0300, 0x0304, 0x0310, 0x0314, 0x0320, 0x0324, 0x0330,
|
||||||
|
0x0334, 0x0380, 0x0384, 0x0390, 0x0394, 0x03a0, 0x03a4, 0x03b0, 0x03b4, 0x0400, 0x0404,
|
||||||
|
0x0410, 0x0414, 0x0420, 0x0424, 0x0430, 0x0434, 0x0480, 0x0484, 0x0490, 0x0494, 0x04a0,
|
||||||
|
0x04a4, 0x04b0, 0x04b4, 0x0500, 0x0504, 0x0510, 0x0514, 0x0520, 0x0524, 0x0530, 0x0534,
|
||||||
|
0x0580, 0x0584, 0x0590, 0x0594, 0x05a0, 0x05a4, 0x05b0, 0x05b4, 0x0600, 0x0604, 0x0610,
|
||||||
|
0x0614, 0x0620, 0x0624, 0x0630, 0x0634, 0x0680, 0x0684, 0x0690, 0x0694, 0x06a0, 0x06a4,
|
||||||
|
0x06b0, 0x06b4, 0x0700, 0x0704, 0x0710, 0x0714, 0x0720, 0x0724, 0x0730, 0x0734, 0x0780,
|
||||||
|
0x0784, 0x0790, 0x0794, 0x07a0, 0x07a4, 0x07b0, 0x07b4, 0x0000, 0x0004, 0x0010, 0x0014,
|
||||||
|
0x0020, 0x0024, 0x0030, 0x0034, 0x0080, 0x0084, 0x0090, 0x0094, 0x00a0, 0x00a4, 0x00b0,
|
||||||
|
0x00b4, 0x0100, 0x0104, 0x0110, 0x0114, 0x0120, 0x0124, 0x0130, 0x0134, 0x0180, 0x0184,
|
||||||
|
0x0190, 0x0194, 0x01a0, 0x01a4, 0x01b0, 0x01b4, 0x0200, 0x0204, 0x0210, 0x0214, 0x0220,
|
||||||
|
0x0224, 0x0230, 0x0234, 0x0280, 0x0284, 0x0290, 0x0294, 0x02a0, 0x02a4, 0x02b0, 0x02b4,
|
||||||
|
0x0300, 0x0304, 0x0310, 0x0314, 0x0320, 0x0324, 0x0330, 0x0334, 0x0380, 0x0384, 0x0390,
|
||||||
|
0x0394, 0x03a0, 0x03a4, 0x03b0, 0x03b4, 0x0400, 0x0404, 0x0410, 0x0414, 0x0420, 0x0424,
|
||||||
|
0x0430, 0x0434, 0x0480, 0x0484, 0x0490, 0x0494, 0x04a0, 0x04a4, 0x04b0, 0x04b4, 0x0500,
|
||||||
|
0x0504, 0x0510, 0x0514, 0x0520, 0x0524, 0x0530, 0x0534, 0x0580, 0x0584, 0x0590, 0x0594,
|
||||||
|
0x05a0, 0x05a4, 0x05b0, 0x05b4, 0x0600, 0x0604, 0x0610, 0x0614, 0x0620, 0x0624, 0x0630,
|
||||||
|
0x0634, 0x0680, 0x0684, 0x0690, 0x0694, 0x06a0, 0x06a4, 0x06b0, 0x06b4, 0x0700, 0x0704,
|
||||||
|
0x0710, 0x0714, 0x0720, 0x0724, 0x0730, 0x0734, 0x0780, 0x0784, 0x0790, 0x0794, 0x07a0,
|
||||||
|
0x07a4, 0x07b0, 0x07b4, 0x0000, 0x0004, 0x0010, 0x0014, 0x0020, 0x0024, 0x0030, 0x0034,
|
||||||
|
0x0080, 0x0084, 0x0090, 0x0094, 0x00a0, 0x00a4, 0x00b0, 0x00b4, 0x0100, 0x0104, 0x0110,
|
||||||
|
0x0114, 0x0120, 0x0124, 0x0130, 0x0134, 0x0180, 0x0184, 0x0190, 0x0194, 0x01a0, 0x01a4,
|
||||||
|
0x01b0, 0x01b4, 0x0200, 0x0204, 0x0210, 0x0214, 0x0220, 0x0224, 0x0230, 0x0234, 0x0280,
|
||||||
|
0x0284, 0x0290, 0x0294, 0x02a0, 0x02a4, 0x02b0, 0x02b4, 0x0300, 0x0304, 0x0310, 0x0314,
|
||||||
|
0x0320, 0x0324, 0x0330, 0x0334, 0x0380, 0x0384, 0x0390, 0x0394, 0x03a0, 0x03a4, 0x03b0,
|
||||||
|
0x03b4, 0x0400, 0x0404, 0x0410, 0x0414, 0x0420, 0x0424, 0x0430, 0x0434, 0x0480, 0x0484,
|
||||||
|
0x0490, 0x0494, 0x04a0, 0x04a4, 0x04b0, 0x04b4, 0x0500, 0x0504, 0x0510, 0x0514, 0x0520,
|
||||||
|
0x0524, 0x0530, 0x0534, 0x0580, 0x0584, 0x0590, 0x0594, 0x05a0, 0x05a4, 0x05b0, 0x05b4,
|
||||||
|
0x0600, 0x0604, 0x0610, 0x0614, 0x0620, 0x0624, 0x0630, 0x0634, 0x0680, 0x0684, 0x0690,
|
||||||
|
0x0694, 0x06a0, 0x06a4, 0x06b0, 0x06b4, 0x0700, 0x0704, 0x0710, 0x0714, 0x0720, 0x0724,
|
||||||
|
0x0730, 0x0734, 0x0780, 0x0784, 0x0790, 0x0794, 0x07a0, 0x07a4, 0x07b0, 0x07b4,
|
||||||
|
};
|
||||||
|
return xlut[x % 128] + ylut[y % 128];
|
||||||
|
}
|
||||||
|
|
||||||
|
static u32 GetMortonOffset128(u32 x, u32 y, u32 bytes_per_pixel) {
|
||||||
|
// Calculates the offset of the position of the pixel in Morton order
|
||||||
|
// Framebuffer images are split into 128x128 tiles.
|
||||||
|
|
||||||
|
const unsigned int block_height = 128;
|
||||||
|
const unsigned int coarse_x = x & ~127;
|
||||||
|
|
||||||
|
u32 i = MortonInterleave128(x, y);
|
||||||
|
|
||||||
|
const unsigned int offset = coarse_x * block_height;
|
||||||
|
|
||||||
|
return (i + offset) * bytes_per_pixel;
|
||||||
|
}
|
||||||
|
|
||||||
|
void MortonSwizzle(MortonSwizzleMode mode, Surface::PixelFormat format, u32 stride,
|
||||||
|
u32 block_height, u32 height, u32 block_depth, u32 depth, u8* buffer,
|
||||||
|
std::size_t buffer_size, VAddr addr) {
|
||||||
|
|
||||||
|
GetSwizzleFunction(mode, format)(stride, block_height, height, block_depth, depth, buffer,
|
||||||
|
buffer_size, addr);
|
||||||
|
}
|
||||||
|
|
||||||
|
void MortonCopyPixels128(u32 width, u32 height, u32 bytes_per_pixel, u32 linear_bytes_per_pixel,
|
||||||
|
u8* morton_data, u8* linear_data, bool morton_to_linear) {
|
||||||
|
u8* data_ptrs[2];
|
||||||
|
for (unsigned y = 0; y < height; ++y) {
|
||||||
|
for (unsigned x = 0; x < width; ++x) {
|
||||||
|
const u32 coarse_y = y & ~127;
|
||||||
|
u32 morton_offset =
|
||||||
|
GetMortonOffset128(x, y, bytes_per_pixel) + coarse_y * width * bytes_per_pixel;
|
||||||
|
u32 gl_pixel_index = (x + y * width) * linear_bytes_per_pixel;
|
||||||
|
|
||||||
|
data_ptrs[morton_to_linear] = morton_data + morton_offset;
|
||||||
|
data_ptrs[!morton_to_linear] = &linear_data[gl_pixel_index];
|
||||||
|
|
||||||
|
memcpy(data_ptrs[0], data_ptrs[1], bytes_per_pixel);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace VideoCore
|
||||||
21
src/video_core/morton.h
Normal file
21
src/video_core/morton.h
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
// Copyright 2018 yuzu Emulator Project
|
||||||
|
// Licensed under GPLv2 or any later version
|
||||||
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "common/common_types.h"
|
||||||
|
#include "video_core/surface.h"
|
||||||
|
|
||||||
|
namespace VideoCore {
|
||||||
|
|
||||||
|
enum class MortonSwizzleMode { MortonToLinear, LinearToMorton };
|
||||||
|
|
||||||
|
void MortonSwizzle(MortonSwizzleMode mode, VideoCore::Surface::PixelFormat format, u32 stride,
|
||||||
|
u32 block_height, u32 height, u32 block_depth, u32 depth, u8* buffer,
|
||||||
|
std::size_t buffer_size, VAddr addr);
|
||||||
|
|
||||||
|
void MortonCopyPixels128(u32 width, u32 height, u32 bytes_per_pixel, u32 linear_bytes_per_pixel,
|
||||||
|
u8* morton_data, u8* linear_data, bool morton_to_linear);
|
||||||
|
|
||||||
|
} // namespace VideoCore
|
||||||
|
|
@ -15,6 +15,7 @@
|
||||||
#include "core/memory.h"
|
#include "core/memory.h"
|
||||||
#include "core/settings.h"
|
#include "core/settings.h"
|
||||||
#include "video_core/engines/maxwell_3d.h"
|
#include "video_core/engines/maxwell_3d.h"
|
||||||
|
#include "video_core/morton.h"
|
||||||
#include "video_core/renderer_opengl/gl_rasterizer.h"
|
#include "video_core/renderer_opengl/gl_rasterizer.h"
|
||||||
#include "video_core/renderer_opengl/gl_rasterizer_cache.h"
|
#include "video_core/renderer_opengl/gl_rasterizer_cache.h"
|
||||||
#include "video_core/renderer_opengl/gl_state.h"
|
#include "video_core/renderer_opengl/gl_state.h"
|
||||||
|
|
@ -22,10 +23,11 @@
|
||||||
#include "video_core/surface.h"
|
#include "video_core/surface.h"
|
||||||
#include "video_core/textures/astc.h"
|
#include "video_core/textures/astc.h"
|
||||||
#include "video_core/textures/decoders.h"
|
#include "video_core/textures/decoders.h"
|
||||||
#include "video_core/utils.h"
|
|
||||||
|
|
||||||
namespace OpenGL {
|
namespace OpenGL {
|
||||||
|
|
||||||
|
using VideoCore::MortonSwizzle;
|
||||||
|
using VideoCore::MortonSwizzleMode;
|
||||||
using VideoCore::Surface::ComponentTypeFromDepthFormat;
|
using VideoCore::Surface::ComponentTypeFromDepthFormat;
|
||||||
using VideoCore::Surface::ComponentTypeFromRenderTarget;
|
using VideoCore::Surface::ComponentTypeFromRenderTarget;
|
||||||
using VideoCore::Surface::ComponentTypeFromTexture;
|
using VideoCore::Surface::ComponentTypeFromTexture;
|
||||||
|
|
@ -370,174 +372,7 @@ MathUtil::Rectangle<u32> SurfaceParams::GetRect(u32 mip_level) const {
|
||||||
return {0, actual_height, MipWidth(mip_level), 0};
|
return {0, actual_height, MipWidth(mip_level), 0};
|
||||||
}
|
}
|
||||||
|
|
||||||
template <bool morton_to_gl, PixelFormat format>
|
void SwizzleFunc(const MortonSwizzleMode& mode, const SurfaceParams& params,
|
||||||
void MortonCopy(u32 stride, u32 block_height, u32 height, u32 block_depth, u32 depth, u8* gl_buffer,
|
|
||||||
std::size_t gl_buffer_size, VAddr addr) {
|
|
||||||
constexpr u32 bytes_per_pixel = GetBytesPerPixel(format);
|
|
||||||
|
|
||||||
// With the BCn formats (DXT and DXN), each 4x4 tile is swizzled instead of just individual
|
|
||||||
// pixel values.
|
|
||||||
const u32 tile_size_x{GetDefaultBlockWidth(format)};
|
|
||||||
const u32 tile_size_y{GetDefaultBlockHeight(format)};
|
|
||||||
|
|
||||||
if (morton_to_gl) {
|
|
||||||
Tegra::Texture::UnswizzleTexture(gl_buffer, addr, tile_size_x, tile_size_y, bytes_per_pixel,
|
|
||||||
stride, height, depth, block_height, block_depth);
|
|
||||||
} else {
|
|
||||||
Tegra::Texture::CopySwizzledData((stride + tile_size_x - 1) / tile_size_x,
|
|
||||||
(height + tile_size_y - 1) / tile_size_y, depth,
|
|
||||||
bytes_per_pixel, bytes_per_pixel, Memory::GetPointer(addr),
|
|
||||||
gl_buffer, false, block_height, block_depth);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
using GLConversionArray = std::array<void (*)(u32, u32, u32, u32, u32, u8*, std::size_t, VAddr),
|
|
||||||
VideoCore::Surface::MaxPixelFormat>;
|
|
||||||
|
|
||||||
static constexpr GLConversionArray morton_to_gl_fns = {
|
|
||||||
// clang-format off
|
|
||||||
MortonCopy<true, PixelFormat::ABGR8U>,
|
|
||||||
MortonCopy<true, PixelFormat::ABGR8S>,
|
|
||||||
MortonCopy<true, PixelFormat::ABGR8UI>,
|
|
||||||
MortonCopy<true, PixelFormat::B5G6R5U>,
|
|
||||||
MortonCopy<true, PixelFormat::A2B10G10R10U>,
|
|
||||||
MortonCopy<true, PixelFormat::A1B5G5R5U>,
|
|
||||||
MortonCopy<true, PixelFormat::R8U>,
|
|
||||||
MortonCopy<true, PixelFormat::R8UI>,
|
|
||||||
MortonCopy<true, PixelFormat::RGBA16F>,
|
|
||||||
MortonCopy<true, PixelFormat::RGBA16U>,
|
|
||||||
MortonCopy<true, PixelFormat::RGBA16UI>,
|
|
||||||
MortonCopy<true, PixelFormat::R11FG11FB10F>,
|
|
||||||
MortonCopy<true, PixelFormat::RGBA32UI>,
|
|
||||||
MortonCopy<true, PixelFormat::DXT1>,
|
|
||||||
MortonCopy<true, PixelFormat::DXT23>,
|
|
||||||
MortonCopy<true, PixelFormat::DXT45>,
|
|
||||||
MortonCopy<true, PixelFormat::DXN1>,
|
|
||||||
MortonCopy<true, PixelFormat::DXN2UNORM>,
|
|
||||||
MortonCopy<true, PixelFormat::DXN2SNORM>,
|
|
||||||
MortonCopy<true, PixelFormat::BC7U>,
|
|
||||||
MortonCopy<true, PixelFormat::BC6H_UF16>,
|
|
||||||
MortonCopy<true, PixelFormat::BC6H_SF16>,
|
|
||||||
MortonCopy<true, PixelFormat::ASTC_2D_4X4>,
|
|
||||||
MortonCopy<true, PixelFormat::G8R8U>,
|
|
||||||
MortonCopy<true, PixelFormat::G8R8S>,
|
|
||||||
MortonCopy<true, PixelFormat::BGRA8>,
|
|
||||||
MortonCopy<true, PixelFormat::RGBA32F>,
|
|
||||||
MortonCopy<true, PixelFormat::RG32F>,
|
|
||||||
MortonCopy<true, PixelFormat::R32F>,
|
|
||||||
MortonCopy<true, PixelFormat::R16F>,
|
|
||||||
MortonCopy<true, PixelFormat::R16U>,
|
|
||||||
MortonCopy<true, PixelFormat::R16S>,
|
|
||||||
MortonCopy<true, PixelFormat::R16UI>,
|
|
||||||
MortonCopy<true, PixelFormat::R16I>,
|
|
||||||
MortonCopy<true, PixelFormat::RG16>,
|
|
||||||
MortonCopy<true, PixelFormat::RG16F>,
|
|
||||||
MortonCopy<true, PixelFormat::RG16UI>,
|
|
||||||
MortonCopy<true, PixelFormat::RG16I>,
|
|
||||||
MortonCopy<true, PixelFormat::RG16S>,
|
|
||||||
MortonCopy<true, PixelFormat::RGB32F>,
|
|
||||||
MortonCopy<true, PixelFormat::RGBA8_SRGB>,
|
|
||||||
MortonCopy<true, PixelFormat::RG8U>,
|
|
||||||
MortonCopy<true, PixelFormat::RG8S>,
|
|
||||||
MortonCopy<true, PixelFormat::RG32UI>,
|
|
||||||
MortonCopy<true, PixelFormat::R32UI>,
|
|
||||||
MortonCopy<true, PixelFormat::ASTC_2D_8X8>,
|
|
||||||
MortonCopy<true, PixelFormat::ASTC_2D_8X5>,
|
|
||||||
MortonCopy<true, PixelFormat::ASTC_2D_5X4>,
|
|
||||||
MortonCopy<true, PixelFormat::BGRA8_SRGB>,
|
|
||||||
MortonCopy<true, PixelFormat::DXT1_SRGB>,
|
|
||||||
MortonCopy<true, PixelFormat::DXT23_SRGB>,
|
|
||||||
MortonCopy<true, PixelFormat::DXT45_SRGB>,
|
|
||||||
MortonCopy<true, PixelFormat::BC7U_SRGB>,
|
|
||||||
MortonCopy<true, PixelFormat::ASTC_2D_4X4_SRGB>,
|
|
||||||
MortonCopy<true, PixelFormat::ASTC_2D_8X8_SRGB>,
|
|
||||||
MortonCopy<true, PixelFormat::ASTC_2D_8X5_SRGB>,
|
|
||||||
MortonCopy<true, PixelFormat::ASTC_2D_5X4_SRGB>,
|
|
||||||
MortonCopy<true, PixelFormat::ASTC_2D_5X5>,
|
|
||||||
MortonCopy<true, PixelFormat::ASTC_2D_5X5_SRGB>,
|
|
||||||
MortonCopy<true, PixelFormat::ASTC_2D_10X8>,
|
|
||||||
MortonCopy<true, PixelFormat::ASTC_2D_10X8_SRGB>,
|
|
||||||
MortonCopy<true, PixelFormat::Z32F>,
|
|
||||||
MortonCopy<true, PixelFormat::Z16>,
|
|
||||||
MortonCopy<true, PixelFormat::Z24S8>,
|
|
||||||
MortonCopy<true, PixelFormat::S8Z24>,
|
|
||||||
MortonCopy<true, PixelFormat::Z32FS8>,
|
|
||||||
// clang-format on
|
|
||||||
};
|
|
||||||
|
|
||||||
static constexpr GLConversionArray gl_to_morton_fns = {
|
|
||||||
// clang-format off
|
|
||||||
MortonCopy<false, PixelFormat::ABGR8U>,
|
|
||||||
MortonCopy<false, PixelFormat::ABGR8S>,
|
|
||||||
MortonCopy<false, PixelFormat::ABGR8UI>,
|
|
||||||
MortonCopy<false, PixelFormat::B5G6R5U>,
|
|
||||||
MortonCopy<false, PixelFormat::A2B10G10R10U>,
|
|
||||||
MortonCopy<false, PixelFormat::A1B5G5R5U>,
|
|
||||||
MortonCopy<false, PixelFormat::R8U>,
|
|
||||||
MortonCopy<false, PixelFormat::R8UI>,
|
|
||||||
MortonCopy<false, PixelFormat::RGBA16F>,
|
|
||||||
MortonCopy<false, PixelFormat::RGBA16U>,
|
|
||||||
MortonCopy<false, PixelFormat::RGBA16UI>,
|
|
||||||
MortonCopy<false, PixelFormat::R11FG11FB10F>,
|
|
||||||
MortonCopy<false, PixelFormat::RGBA32UI>,
|
|
||||||
MortonCopy<false, PixelFormat::DXT1>,
|
|
||||||
MortonCopy<false, PixelFormat::DXT23>,
|
|
||||||
MortonCopy<false, PixelFormat::DXT45>,
|
|
||||||
MortonCopy<false, PixelFormat::DXN1>,
|
|
||||||
MortonCopy<false, PixelFormat::DXN2UNORM>,
|
|
||||||
MortonCopy<false, PixelFormat::DXN2SNORM>,
|
|
||||||
MortonCopy<false, PixelFormat::BC7U>,
|
|
||||||
MortonCopy<false, PixelFormat::BC6H_UF16>,
|
|
||||||
MortonCopy<false, PixelFormat::BC6H_SF16>,
|
|
||||||
// TODO(Subv): Swizzling ASTC formats are not supported
|
|
||||||
nullptr,
|
|
||||||
MortonCopy<false, PixelFormat::G8R8U>,
|
|
||||||
MortonCopy<false, PixelFormat::G8R8S>,
|
|
||||||
MortonCopy<false, PixelFormat::BGRA8>,
|
|
||||||
MortonCopy<false, PixelFormat::RGBA32F>,
|
|
||||||
MortonCopy<false, PixelFormat::RG32F>,
|
|
||||||
MortonCopy<false, PixelFormat::R32F>,
|
|
||||||
MortonCopy<false, PixelFormat::R16F>,
|
|
||||||
MortonCopy<false, PixelFormat::R16U>,
|
|
||||||
MortonCopy<false, PixelFormat::R16S>,
|
|
||||||
MortonCopy<false, PixelFormat::R16UI>,
|
|
||||||
MortonCopy<false, PixelFormat::R16I>,
|
|
||||||
MortonCopy<false, PixelFormat::RG16>,
|
|
||||||
MortonCopy<false, PixelFormat::RG16F>,
|
|
||||||
MortonCopy<false, PixelFormat::RG16UI>,
|
|
||||||
MortonCopy<false, PixelFormat::RG16I>,
|
|
||||||
MortonCopy<false, PixelFormat::RG16S>,
|
|
||||||
MortonCopy<false, PixelFormat::RGB32F>,
|
|
||||||
MortonCopy<false, PixelFormat::RGBA8_SRGB>,
|
|
||||||
MortonCopy<false, PixelFormat::RG8U>,
|
|
||||||
MortonCopy<false, PixelFormat::RG8S>,
|
|
||||||
MortonCopy<false, PixelFormat::RG32UI>,
|
|
||||||
MortonCopy<false, PixelFormat::R32UI>,
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
MortonCopy<false, PixelFormat::BGRA8_SRGB>,
|
|
||||||
MortonCopy<false, PixelFormat::DXT1_SRGB>,
|
|
||||||
MortonCopy<false, PixelFormat::DXT23_SRGB>,
|
|
||||||
MortonCopy<false, PixelFormat::DXT45_SRGB>,
|
|
||||||
MortonCopy<false, PixelFormat::BC7U_SRGB>,
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
MortonCopy<false, PixelFormat::Z32F>,
|
|
||||||
MortonCopy<false, PixelFormat::Z16>,
|
|
||||||
MortonCopy<false, PixelFormat::Z24S8>,
|
|
||||||
MortonCopy<false, PixelFormat::S8Z24>,
|
|
||||||
MortonCopy<false, PixelFormat::Z32FS8>,
|
|
||||||
// clang-format on
|
|
||||||
};
|
|
||||||
|
|
||||||
void SwizzleFunc(const GLConversionArray& functions, const SurfaceParams& params,
|
|
||||||
std::vector<u8>& gl_buffer, u32 mip_level) {
|
std::vector<u8>& gl_buffer, u32 mip_level) {
|
||||||
u32 depth = params.MipDepth(mip_level);
|
u32 depth = params.MipDepth(mip_level);
|
||||||
if (params.target == SurfaceTarget::Texture2D) {
|
if (params.target == SurfaceTarget::Texture2D) {
|
||||||
|
|
@ -550,19 +385,19 @@ void SwizzleFunc(const GLConversionArray& functions, const SurfaceParams& params
|
||||||
const u64 layer_size = params.LayerMemorySize();
|
const u64 layer_size = params.LayerMemorySize();
|
||||||
const u64 gl_size = params.LayerSizeGL(mip_level);
|
const u64 gl_size = params.LayerSizeGL(mip_level);
|
||||||
for (u32 i = 0; i < params.depth; i++) {
|
for (u32 i = 0; i < params.depth; i++) {
|
||||||
functions[static_cast<std::size_t>(params.pixel_format)](
|
MortonSwizzle(mode, params.pixel_format, params.MipWidth(mip_level),
|
||||||
params.MipWidth(mip_level), params.MipBlockHeight(mip_level),
|
params.MipBlockHeight(mip_level), params.MipHeight(mip_level),
|
||||||
params.MipHeight(mip_level), params.MipBlockDepth(mip_level), 1,
|
params.MipBlockDepth(mip_level), 1, gl_buffer.data() + offset_gl, gl_size,
|
||||||
gl_buffer.data() + offset_gl, gl_size, params.addr + offset);
|
params.addr + offset);
|
||||||
offset += layer_size;
|
offset += layer_size;
|
||||||
offset_gl += gl_size;
|
offset_gl += gl_size;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
const u64 offset = params.GetMipmapLevelOffset(mip_level);
|
const u64 offset = params.GetMipmapLevelOffset(mip_level);
|
||||||
functions[static_cast<std::size_t>(params.pixel_format)](
|
MortonSwizzle(mode, params.pixel_format, params.MipWidth(mip_level),
|
||||||
params.MipWidth(mip_level), params.MipBlockHeight(mip_level),
|
params.MipBlockHeight(mip_level), params.MipHeight(mip_level),
|
||||||
params.MipHeight(mip_level), params.MipBlockDepth(mip_level), depth, gl_buffer.data(),
|
params.MipBlockDepth(mip_level), depth, gl_buffer.data(), gl_buffer.size(),
|
||||||
gl_buffer.size(), params.addr + offset);
|
params.addr + offset);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -996,7 +831,7 @@ void CachedSurface::LoadGLBuffer() {
|
||||||
ASSERT_MSG(params.block_width == 1, "Block width is defined as {} on texture type {}",
|
ASSERT_MSG(params.block_width == 1, "Block width is defined as {} on texture type {}",
|
||||||
params.block_width, static_cast<u32>(params.target));
|
params.block_width, static_cast<u32>(params.target));
|
||||||
for (u32 i = 0; i < params.max_mip_level; i++)
|
for (u32 i = 0; i < params.max_mip_level; i++)
|
||||||
SwizzleFunc(morton_to_gl_fns, params, gl_buffer[i], i);
|
SwizzleFunc(MortonSwizzleMode::MortonToLinear, params, gl_buffer[i], i);
|
||||||
} else {
|
} else {
|
||||||
const auto texture_src_data{Memory::GetPointer(params.addr)};
|
const auto texture_src_data{Memory::GetPointer(params.addr)};
|
||||||
const auto texture_src_data_end{texture_src_data + params.size_in_bytes_gl};
|
const auto texture_src_data_end{texture_src_data + params.size_in_bytes_gl};
|
||||||
|
|
@ -1035,7 +870,7 @@ void CachedSurface::FlushGLBuffer() {
|
||||||
ASSERT_MSG(params.block_width == 1, "Block width is defined as {} on texture type {}",
|
ASSERT_MSG(params.block_width == 1, "Block width is defined as {} on texture type {}",
|
||||||
params.block_width, static_cast<u32>(params.target));
|
params.block_width, static_cast<u32>(params.target));
|
||||||
|
|
||||||
SwizzleFunc(gl_to_morton_fns, params, gl_buffer[0], 0);
|
SwizzleFunc(MortonSwizzleMode::LinearToMorton, params, gl_buffer[0], 0);
|
||||||
} else {
|
} else {
|
||||||
std::memcpy(Memory::GetPointer(GetAddr()), gl_buffer[0].data(), GetSizeInBytes());
|
std::memcpy(Memory::GetPointer(GetAddr()), gl_buffer[0].data(), GetSizeInBytes());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,9 +19,9 @@
|
||||||
#include "core/settings.h"
|
#include "core/settings.h"
|
||||||
#include "core/telemetry_session.h"
|
#include "core/telemetry_session.h"
|
||||||
#include "core/tracer/recorder.h"
|
#include "core/tracer/recorder.h"
|
||||||
|
#include "video_core/morton.h"
|
||||||
#include "video_core/renderer_opengl/gl_rasterizer.h"
|
#include "video_core/renderer_opengl/gl_rasterizer.h"
|
||||||
#include "video_core/renderer_opengl/renderer_opengl.h"
|
#include "video_core/renderer_opengl/renderer_opengl.h"
|
||||||
#include "video_core/utils.h"
|
|
||||||
|
|
||||||
namespace OpenGL {
|
namespace OpenGL {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,164 +0,0 @@
|
||||||
// Copyright 2014 Citra Emulator Project
|
|
||||||
// Licensed under GPLv2 or any later version
|
|
||||||
// Refer to the license.txt file included.
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "common/common_types.h"
|
|
||||||
|
|
||||||
namespace VideoCore {
|
|
||||||
|
|
||||||
// 8x8 Z-Order coordinate from 2D coordinates
|
|
||||||
static inline u32 MortonInterleave(u32 x, u32 y) {
|
|
||||||
static const u32 xlut[] = {0x00, 0x01, 0x04, 0x05, 0x10, 0x11, 0x14, 0x15};
|
|
||||||
static const u32 ylut[] = {0x00, 0x02, 0x08, 0x0a, 0x20, 0x22, 0x28, 0x2a};
|
|
||||||
return xlut[x % 8] + ylut[y % 8];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Calculates the offset of the position of the pixel in Morton order
|
|
||||||
*/
|
|
||||||
static inline u32 GetMortonOffset(u32 x, u32 y, u32 bytes_per_pixel) {
|
|
||||||
// Images are split into 8x8 tiles. Each tile is composed of four 4x4 subtiles each
|
|
||||||
// of which is composed of four 2x2 subtiles each of which is composed of four texels.
|
|
||||||
// Each structure is embedded into the next-bigger one in a diagonal pattern, e.g.
|
|
||||||
// texels are laid out in a 2x2 subtile like this:
|
|
||||||
// 2 3
|
|
||||||
// 0 1
|
|
||||||
//
|
|
||||||
// The full 8x8 tile has the texels arranged like this:
|
|
||||||
//
|
|
||||||
// 42 43 46 47 58 59 62 63
|
|
||||||
// 40 41 44 45 56 57 60 61
|
|
||||||
// 34 35 38 39 50 51 54 55
|
|
||||||
// 32 33 36 37 48 49 52 53
|
|
||||||
// 10 11 14 15 26 27 30 31
|
|
||||||
// 08 09 12 13 24 25 28 29
|
|
||||||
// 02 03 06 07 18 19 22 23
|
|
||||||
// 00 01 04 05 16 17 20 21
|
|
||||||
//
|
|
||||||
// This pattern is what's called Z-order curve, or Morton order.
|
|
||||||
|
|
||||||
const unsigned int block_height = 8;
|
|
||||||
const unsigned int coarse_x = x & ~7;
|
|
||||||
|
|
||||||
u32 i = VideoCore::MortonInterleave(x, y);
|
|
||||||
|
|
||||||
const unsigned int offset = coarse_x * block_height;
|
|
||||||
|
|
||||||
return (i + offset) * bytes_per_pixel;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline u32 MortonInterleave128(u32 x, u32 y) {
|
|
||||||
// 128x128 Z-Order coordinate from 2D coordinates
|
|
||||||
static constexpr u32 xlut[] = {
|
|
||||||
0x0000, 0x0001, 0x0002, 0x0003, 0x0008, 0x0009, 0x000a, 0x000b, 0x0040, 0x0041, 0x0042,
|
|
||||||
0x0043, 0x0048, 0x0049, 0x004a, 0x004b, 0x0800, 0x0801, 0x0802, 0x0803, 0x0808, 0x0809,
|
|
||||||
0x080a, 0x080b, 0x0840, 0x0841, 0x0842, 0x0843, 0x0848, 0x0849, 0x084a, 0x084b, 0x1000,
|
|
||||||
0x1001, 0x1002, 0x1003, 0x1008, 0x1009, 0x100a, 0x100b, 0x1040, 0x1041, 0x1042, 0x1043,
|
|
||||||
0x1048, 0x1049, 0x104a, 0x104b, 0x1800, 0x1801, 0x1802, 0x1803, 0x1808, 0x1809, 0x180a,
|
|
||||||
0x180b, 0x1840, 0x1841, 0x1842, 0x1843, 0x1848, 0x1849, 0x184a, 0x184b, 0x2000, 0x2001,
|
|
||||||
0x2002, 0x2003, 0x2008, 0x2009, 0x200a, 0x200b, 0x2040, 0x2041, 0x2042, 0x2043, 0x2048,
|
|
||||||
0x2049, 0x204a, 0x204b, 0x2800, 0x2801, 0x2802, 0x2803, 0x2808, 0x2809, 0x280a, 0x280b,
|
|
||||||
0x2840, 0x2841, 0x2842, 0x2843, 0x2848, 0x2849, 0x284a, 0x284b, 0x3000, 0x3001, 0x3002,
|
|
||||||
0x3003, 0x3008, 0x3009, 0x300a, 0x300b, 0x3040, 0x3041, 0x3042, 0x3043, 0x3048, 0x3049,
|
|
||||||
0x304a, 0x304b, 0x3800, 0x3801, 0x3802, 0x3803, 0x3808, 0x3809, 0x380a, 0x380b, 0x3840,
|
|
||||||
0x3841, 0x3842, 0x3843, 0x3848, 0x3849, 0x384a, 0x384b, 0x0000, 0x0001, 0x0002, 0x0003,
|
|
||||||
0x0008, 0x0009, 0x000a, 0x000b, 0x0040, 0x0041, 0x0042, 0x0043, 0x0048, 0x0049, 0x004a,
|
|
||||||
0x004b, 0x0800, 0x0801, 0x0802, 0x0803, 0x0808, 0x0809, 0x080a, 0x080b, 0x0840, 0x0841,
|
|
||||||
0x0842, 0x0843, 0x0848, 0x0849, 0x084a, 0x084b, 0x1000, 0x1001, 0x1002, 0x1003, 0x1008,
|
|
||||||
0x1009, 0x100a, 0x100b, 0x1040, 0x1041, 0x1042, 0x1043, 0x1048, 0x1049, 0x104a, 0x104b,
|
|
||||||
0x1800, 0x1801, 0x1802, 0x1803, 0x1808, 0x1809, 0x180a, 0x180b, 0x1840, 0x1841, 0x1842,
|
|
||||||
0x1843, 0x1848, 0x1849, 0x184a, 0x184b, 0x2000, 0x2001, 0x2002, 0x2003, 0x2008, 0x2009,
|
|
||||||
0x200a, 0x200b, 0x2040, 0x2041, 0x2042, 0x2043, 0x2048, 0x2049, 0x204a, 0x204b, 0x2800,
|
|
||||||
0x2801, 0x2802, 0x2803, 0x2808, 0x2809, 0x280a, 0x280b, 0x2840, 0x2841, 0x2842, 0x2843,
|
|
||||||
0x2848, 0x2849, 0x284a, 0x284b, 0x3000, 0x3001, 0x3002, 0x3003, 0x3008, 0x3009, 0x300a,
|
|
||||||
0x300b, 0x3040, 0x3041, 0x3042, 0x3043, 0x3048, 0x3049, 0x304a, 0x304b, 0x3800, 0x3801,
|
|
||||||
0x3802, 0x3803, 0x3808, 0x3809, 0x380a, 0x380b, 0x3840, 0x3841, 0x3842, 0x3843, 0x3848,
|
|
||||||
0x3849, 0x384a, 0x384b, 0x0000, 0x0001, 0x0002, 0x0003, 0x0008, 0x0009, 0x000a, 0x000b,
|
|
||||||
0x0040, 0x0041, 0x0042, 0x0043, 0x0048, 0x0049, 0x004a, 0x004b, 0x0800, 0x0801, 0x0802,
|
|
||||||
0x0803, 0x0808, 0x0809, 0x080a, 0x080b, 0x0840, 0x0841, 0x0842, 0x0843, 0x0848, 0x0849,
|
|
||||||
0x084a, 0x084b, 0x1000, 0x1001, 0x1002, 0x1003, 0x1008, 0x1009, 0x100a, 0x100b, 0x1040,
|
|
||||||
0x1041, 0x1042, 0x1043, 0x1048, 0x1049, 0x104a, 0x104b, 0x1800, 0x1801, 0x1802, 0x1803,
|
|
||||||
0x1808, 0x1809, 0x180a, 0x180b, 0x1840, 0x1841, 0x1842, 0x1843, 0x1848, 0x1849, 0x184a,
|
|
||||||
0x184b, 0x2000, 0x2001, 0x2002, 0x2003, 0x2008, 0x2009, 0x200a, 0x200b, 0x2040, 0x2041,
|
|
||||||
0x2042, 0x2043, 0x2048, 0x2049, 0x204a, 0x204b, 0x2800, 0x2801, 0x2802, 0x2803, 0x2808,
|
|
||||||
0x2809, 0x280a, 0x280b, 0x2840, 0x2841, 0x2842, 0x2843, 0x2848, 0x2849, 0x284a, 0x284b,
|
|
||||||
0x3000, 0x3001, 0x3002, 0x3003, 0x3008, 0x3009, 0x300a, 0x300b, 0x3040, 0x3041, 0x3042,
|
|
||||||
0x3043, 0x3048, 0x3049, 0x304a, 0x304b, 0x3800, 0x3801, 0x3802, 0x3803, 0x3808, 0x3809,
|
|
||||||
0x380a, 0x380b, 0x3840, 0x3841, 0x3842, 0x3843, 0x3848, 0x3849, 0x384a, 0x384b,
|
|
||||||
};
|
|
||||||
static constexpr u32 ylut[] = {
|
|
||||||
0x0000, 0x0004, 0x0010, 0x0014, 0x0020, 0x0024, 0x0030, 0x0034, 0x0080, 0x0084, 0x0090,
|
|
||||||
0x0094, 0x00a0, 0x00a4, 0x00b0, 0x00b4, 0x0100, 0x0104, 0x0110, 0x0114, 0x0120, 0x0124,
|
|
||||||
0x0130, 0x0134, 0x0180, 0x0184, 0x0190, 0x0194, 0x01a0, 0x01a4, 0x01b0, 0x01b4, 0x0200,
|
|
||||||
0x0204, 0x0210, 0x0214, 0x0220, 0x0224, 0x0230, 0x0234, 0x0280, 0x0284, 0x0290, 0x0294,
|
|
||||||
0x02a0, 0x02a4, 0x02b0, 0x02b4, 0x0300, 0x0304, 0x0310, 0x0314, 0x0320, 0x0324, 0x0330,
|
|
||||||
0x0334, 0x0380, 0x0384, 0x0390, 0x0394, 0x03a0, 0x03a4, 0x03b0, 0x03b4, 0x0400, 0x0404,
|
|
||||||
0x0410, 0x0414, 0x0420, 0x0424, 0x0430, 0x0434, 0x0480, 0x0484, 0x0490, 0x0494, 0x04a0,
|
|
||||||
0x04a4, 0x04b0, 0x04b4, 0x0500, 0x0504, 0x0510, 0x0514, 0x0520, 0x0524, 0x0530, 0x0534,
|
|
||||||
0x0580, 0x0584, 0x0590, 0x0594, 0x05a0, 0x05a4, 0x05b0, 0x05b4, 0x0600, 0x0604, 0x0610,
|
|
||||||
0x0614, 0x0620, 0x0624, 0x0630, 0x0634, 0x0680, 0x0684, 0x0690, 0x0694, 0x06a0, 0x06a4,
|
|
||||||
0x06b0, 0x06b4, 0x0700, 0x0704, 0x0710, 0x0714, 0x0720, 0x0724, 0x0730, 0x0734, 0x0780,
|
|
||||||
0x0784, 0x0790, 0x0794, 0x07a0, 0x07a4, 0x07b0, 0x07b4, 0x0000, 0x0004, 0x0010, 0x0014,
|
|
||||||
0x0020, 0x0024, 0x0030, 0x0034, 0x0080, 0x0084, 0x0090, 0x0094, 0x00a0, 0x00a4, 0x00b0,
|
|
||||||
0x00b4, 0x0100, 0x0104, 0x0110, 0x0114, 0x0120, 0x0124, 0x0130, 0x0134, 0x0180, 0x0184,
|
|
||||||
0x0190, 0x0194, 0x01a0, 0x01a4, 0x01b0, 0x01b4, 0x0200, 0x0204, 0x0210, 0x0214, 0x0220,
|
|
||||||
0x0224, 0x0230, 0x0234, 0x0280, 0x0284, 0x0290, 0x0294, 0x02a0, 0x02a4, 0x02b0, 0x02b4,
|
|
||||||
0x0300, 0x0304, 0x0310, 0x0314, 0x0320, 0x0324, 0x0330, 0x0334, 0x0380, 0x0384, 0x0390,
|
|
||||||
0x0394, 0x03a0, 0x03a4, 0x03b0, 0x03b4, 0x0400, 0x0404, 0x0410, 0x0414, 0x0420, 0x0424,
|
|
||||||
0x0430, 0x0434, 0x0480, 0x0484, 0x0490, 0x0494, 0x04a0, 0x04a4, 0x04b0, 0x04b4, 0x0500,
|
|
||||||
0x0504, 0x0510, 0x0514, 0x0520, 0x0524, 0x0530, 0x0534, 0x0580, 0x0584, 0x0590, 0x0594,
|
|
||||||
0x05a0, 0x05a4, 0x05b0, 0x05b4, 0x0600, 0x0604, 0x0610, 0x0614, 0x0620, 0x0624, 0x0630,
|
|
||||||
0x0634, 0x0680, 0x0684, 0x0690, 0x0694, 0x06a0, 0x06a4, 0x06b0, 0x06b4, 0x0700, 0x0704,
|
|
||||||
0x0710, 0x0714, 0x0720, 0x0724, 0x0730, 0x0734, 0x0780, 0x0784, 0x0790, 0x0794, 0x07a0,
|
|
||||||
0x07a4, 0x07b0, 0x07b4, 0x0000, 0x0004, 0x0010, 0x0014, 0x0020, 0x0024, 0x0030, 0x0034,
|
|
||||||
0x0080, 0x0084, 0x0090, 0x0094, 0x00a0, 0x00a4, 0x00b0, 0x00b4, 0x0100, 0x0104, 0x0110,
|
|
||||||
0x0114, 0x0120, 0x0124, 0x0130, 0x0134, 0x0180, 0x0184, 0x0190, 0x0194, 0x01a0, 0x01a4,
|
|
||||||
0x01b0, 0x01b4, 0x0200, 0x0204, 0x0210, 0x0214, 0x0220, 0x0224, 0x0230, 0x0234, 0x0280,
|
|
||||||
0x0284, 0x0290, 0x0294, 0x02a0, 0x02a4, 0x02b0, 0x02b4, 0x0300, 0x0304, 0x0310, 0x0314,
|
|
||||||
0x0320, 0x0324, 0x0330, 0x0334, 0x0380, 0x0384, 0x0390, 0x0394, 0x03a0, 0x03a4, 0x03b0,
|
|
||||||
0x03b4, 0x0400, 0x0404, 0x0410, 0x0414, 0x0420, 0x0424, 0x0430, 0x0434, 0x0480, 0x0484,
|
|
||||||
0x0490, 0x0494, 0x04a0, 0x04a4, 0x04b0, 0x04b4, 0x0500, 0x0504, 0x0510, 0x0514, 0x0520,
|
|
||||||
0x0524, 0x0530, 0x0534, 0x0580, 0x0584, 0x0590, 0x0594, 0x05a0, 0x05a4, 0x05b0, 0x05b4,
|
|
||||||
0x0600, 0x0604, 0x0610, 0x0614, 0x0620, 0x0624, 0x0630, 0x0634, 0x0680, 0x0684, 0x0690,
|
|
||||||
0x0694, 0x06a0, 0x06a4, 0x06b0, 0x06b4, 0x0700, 0x0704, 0x0710, 0x0714, 0x0720, 0x0724,
|
|
||||||
0x0730, 0x0734, 0x0780, 0x0784, 0x0790, 0x0794, 0x07a0, 0x07a4, 0x07b0, 0x07b4,
|
|
||||||
};
|
|
||||||
return xlut[x % 128] + ylut[y % 128];
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline u32 GetMortonOffset128(u32 x, u32 y, u32 bytes_per_pixel) {
|
|
||||||
// Calculates the offset of the position of the pixel in Morton order
|
|
||||||
// Framebuffer images are split into 128x128 tiles.
|
|
||||||
|
|
||||||
const unsigned int block_height = 128;
|
|
||||||
const unsigned int coarse_x = x & ~127;
|
|
||||||
|
|
||||||
u32 i = MortonInterleave128(x, y);
|
|
||||||
|
|
||||||
const unsigned int offset = coarse_x * block_height;
|
|
||||||
|
|
||||||
return (i + offset) * bytes_per_pixel;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void MortonCopyPixels128(u32 width, u32 height, u32 bytes_per_pixel,
|
|
||||||
u32 gl_bytes_per_pixel, u8* morton_data, u8* gl_data,
|
|
||||||
bool morton_to_gl) {
|
|
||||||
u8* data_ptrs[2];
|
|
||||||
for (unsigned y = 0; y < height; ++y) {
|
|
||||||
for (unsigned x = 0; x < width; ++x) {
|
|
||||||
const u32 coarse_y = y & ~127;
|
|
||||||
u32 morton_offset =
|
|
||||||
GetMortonOffset128(x, y, bytes_per_pixel) + coarse_y * width * bytes_per_pixel;
|
|
||||||
u32 gl_pixel_index = (x + y * width) * gl_bytes_per_pixel;
|
|
||||||
|
|
||||||
data_ptrs[morton_to_gl] = morton_data + morton_offset;
|
|
||||||
data_ptrs[!morton_to_gl] = &gl_data[gl_pixel_index];
|
|
||||||
|
|
||||||
memcpy(data_ptrs[0], data_ptrs[1], bytes_per_pixel);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace VideoCore
|
|
||||||
Loading…
Reference in a new issue