From 9da1552417440ca2294f9e06d33be42d933db117 Mon Sep 17 00:00:00 2001 From: bunnei Date: Tue, 3 Jul 2018 14:05:13 -0400 Subject: [PATCH] gl_rasterizer_cache: Implement PixelFormat S8Z24. --- .../renderer_opengl/gl_rasterizer_cache.cpp | 84 ++++++++++++++++--- .../renderer_opengl/gl_rasterizer_cache.h | 8 ++ src/video_core/textures/decoders.cpp | 2 + 3 files changed, 83 insertions(+), 11 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index f9b4a4b87..3a00d9383 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -88,6 +88,8 @@ static constexpr std::array tex_form // DepthStencil formats {GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, ComponentType::UNorm, false}, // Z24S8 + {GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, ComponentType::UNorm, + false}, // S8Z24 }}; static const FormatTuple& GetFormatTuple(PixelFormat pixel_format, ComponentType component_type) { @@ -131,13 +133,6 @@ MathUtil::Rectangle SurfaceParams::GetRect() const { return {0, actual_height, width, 0}; } -static void ConvertASTCToRGBA8(std::vector& data, PixelFormat format, u32 width, u32 height) { - u32 block_width{}; - u32 block_height{}; - std::tie(block_width, block_height) = GetASTCBlockSize(format); - data = Tegra::Texture::ASTC::Decompress(data, width, height, block_width, block_height); -} - template void MortonCopy(u32 stride, u32 block_height, u32 height, u8* gl_buffer, Tegra::GPUVAddr addr) { constexpr u32 bytes_per_pixel = SurfaceParams::GetFormatBpp(format) / CHAR_BIT; @@ -177,6 +172,7 @@ static constexpr std::array, MortonCopy, MortonCopy, MortonCopy, MortonCopy, MortonCopy, + MortonCopy, }; static constexpr std::array, MortonCopy, + MortonCopy, }; // Allocate an uninitialized texture of appropriate size and format for the surface @@ -234,6 +231,71 @@ CachedSurface::CachedSurface(const SurfaceParams& params) : params(params) { rect.GetWidth(), rect.GetHeight()); } +static void ConvertS8Z24ToZ24S8(std::vector& data, u32 width, u32 height) { + union S8Z24 { + BitField<0, 24, u32> z24; + BitField<24, 8, u32> s8; + }; + static_assert(sizeof(S8Z24) == 4, "S8Z24 is incorrect size"); + + union Z24S8 { + BitField<0, 8, u32> s8; + BitField<8, 24, u32> z24; + }; + static_assert(sizeof(Z24S8) == 4, "Z24S8 is incorrect size"); + + S8Z24 input_pixel{}; + Z24S8 output_pixel{}; + for (size_t y = 0; y < height; ++y) { + for (size_t x = 0; x < width; ++x) { + const size_t offset{y * width + x}; + std::memcpy(&input_pixel, &data[offset], sizeof(S8Z24)); + output_pixel.s8.Assign(input_pixel.s8); + output_pixel.z24.Assign(input_pixel.z24); + std::memcpy(&data[offset], &output_pixel, sizeof(Z24S8)); + } + } +} +/** + * Helper function to perform software conversion (as needed) when loading a buffer from Switch + * memory. This is for Maxwell pixel formats that cannot be represented as-is in OpenGL or with + * typical desktop GPUs. + */ +static void ConvertFormatAsNeeded_LoadGLBuffer(std::vector& data, PixelFormat pixel_format, + u32 width, u32 height) { + switch (pixel_format) { + case PixelFormat::ASTC_2D_4X4: { + // Convert ASTC pixel formats to RGBA8, as most desktop GPUs do not support ASTC. + u32 block_width{}; + u32 block_height{}; + std::tie(block_width, block_height) = GetASTCBlockSize(pixel_format); + data = Tegra::Texture::ASTC::Decompress(data, width, height, block_width, block_height); + break; + } + case PixelFormat::S8Z24: + // Convert the S8Z24 depth format to Z24S8, as OpenGL does not support S8Z24. + ConvertS8Z24ToZ24S8(data, width, height); + break; + } +} + +/** + * Helper function to perform software conversion (as needed) when flushing a buffer to Switch + * memory. This is for Maxwell pixel formats that cannot be represented as-is in OpenGL or with + * typical desktop GPUs. + */ +static void ConvertFormatAsNeeded_FlushGLBuffer(std::vector& /*data*/, PixelFormat pixel_format, + u32 /*width*/, u32 /*height*/) { + switch (pixel_format) { + case PixelFormat::ASTC_2D_4X4: + case PixelFormat::S8Z24: + LOG_CRITICAL(Render_OpenGL, "Unimplemented pixel_format={}", + static_cast(pixel_format)); + UNREACHABLE(); + break; + } +} + MICROPROFILE_DEFINE(OpenGL_SurfaceLoad, "OpenGL", "Surface Load", MP_RGB(128, 64, 192)); void CachedSurface::LoadGLBuffer() { ASSERT(params.type != SurfaceType::Fill); @@ -256,10 +318,7 @@ void CachedSurface::LoadGLBuffer() { params.width, params.block_height, params.height, gl_buffer.data(), params.addr); } - if (IsPixelFormatASTC(params.pixel_format)) { - // ASTC formats are converted to RGBA8 in software, as most PC GPUs do not support this - ConvertASTCToRGBA8(gl_buffer, params.pixel_format, params.width, params.height); - } + ConvertFormatAsNeeded_LoadGLBuffer(gl_buffer, params.pixel_format, params.width, params.height); } MICROPROFILE_DEFINE(OpenGL_SurfaceFlush, "OpenGL", "Surface Flush", MP_RGB(128, 192, 64)); @@ -272,6 +331,9 @@ void CachedSurface::FlushGLBuffer() { MICROPROFILE_SCOPE(OpenGL_SurfaceFlush); + ConvertFormatAsNeeded_FlushGLBuffer(gl_buffer, params.pixel_format, params.width, + params.height); + if (!params.is_tiled) { std::memcpy(dst_buffer, gl_buffer.data(), params.size_in_bytes); } else { diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.h b/src/video_core/renderer_opengl/gl_rasterizer_cache.h index 459abbdc2..7aaf371bd 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.h +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.h @@ -41,6 +41,7 @@ struct SurfaceParams { // DepthStencil formats Z24S8 = 13, + S8Z24 = 14, MaxDepthStencilFormat, @@ -92,6 +93,7 @@ struct SurfaceParams { 4, // DXN1 4, // ASTC_2D_4X4 1, // Z24S8 + 1, // S8Z24 }}; ASSERT(static_cast(format) < compression_factor_table.size()); @@ -117,6 +119,7 @@ struct SurfaceParams { 64, // DXN1 32, // ASTC_2D_4X4 32, // Z24S8 + 32, // S8Z24 }}; ASSERT(static_cast(format) < bpp_table.size()); @@ -128,6 +131,8 @@ struct SurfaceParams { static PixelFormat PixelFormatFromDepthFormat(Tegra::DepthFormat format) { switch (format) { + case Tegra::DepthFormat::S8_Z24_UNORM: + return PixelFormat::S8Z24; case Tegra::DepthFormat::Z24_S8_UNORM: return PixelFormat::Z24S8; default: @@ -226,6 +231,8 @@ struct SurfaceParams { static Tegra::DepthFormat DepthFormatFromPixelFormat(PixelFormat format) { switch (format) { + case PixelFormat::S8Z24: + return Tegra::DepthFormat::S8_Z24_UNORM; case PixelFormat::Z24S8: return Tegra::DepthFormat::Z24_S8_UNORM; default: @@ -274,6 +281,7 @@ struct SurfaceParams { static ComponentType ComponentTypeFromDepthFormat(Tegra::DepthFormat format) { switch (format) { + case Tegra::DepthFormat::S8_Z24_UNORM: case Tegra::DepthFormat::Z24_S8_UNORM: return ComponentType::UNorm; default: diff --git a/src/video_core/textures/decoders.cpp b/src/video_core/textures/decoders.cpp index 680f22ddb..7b06fea3e 100644 --- a/src/video_core/textures/decoders.cpp +++ b/src/video_core/textures/decoders.cpp @@ -76,6 +76,7 @@ u32 BytesPerPixel(TextureFormat format) { static u32 DepthBytesPerPixel(DepthFormat format) { switch (format) { + case DepthFormat::S8_Z24_UNORM: case DepthFormat::Z24_S8_UNORM: return 4; default: @@ -129,6 +130,7 @@ std::vector UnswizzleDepthTexture(VAddr address, DepthFormat format, u32 wid std::vector unswizzled_data(width * height * bytes_per_pixel); switch (format) { + case DepthFormat::S8_Z24_UNORM: case DepthFormat::Z24_S8_UNORM: CopySwizzledData(width, height, bytes_per_pixel, bytes_per_pixel, data, unswizzled_data.data(), true, block_height);