From 4c0b1cc1aeaa8332f64b97ba44b449a9d6341795 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sun, 9 Sep 2018 23:42:57 -0400 Subject: [PATCH] gl_rasterizer_cache: Only use depth for applicable texture formats. - Fixes an issue with Octopath Traveler leaving stale data here. --- .../renderer_opengl/gl_rasterizer_cache.cpp | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index 20a8e1cdad..29d61eccdc 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -52,12 +52,28 @@ static VAddr TryGetCpuAddr(Tegra::GPUVAddr gpu_addr) { params.type = GetFormatType(params.pixel_format); params.width = Common::AlignUp(config.tic.Width(), GetCompressionFactor(params.pixel_format)); params.height = Common::AlignUp(config.tic.Height(), GetCompressionFactor(params.pixel_format)); - params.depth = config.tic.Depth(); params.unaligned_height = config.tic.Height(); - params.size_in_bytes = params.SizeInBytes(); params.cache_width = Common::AlignUp(params.width, 8); params.cache_height = Common::AlignUp(params.height, 8); params.target = SurfaceTargetFromTextureType(config.tic.texture_type); + + switch (params.target) { + case SurfaceTarget::Texture1D: + case SurfaceTarget::Texture2D: + params.depth = 1; + break; + case SurfaceTarget::Texture3D: + case SurfaceTarget::Texture2DArray: + params.depth = config.tic.Depth(); + break; + default: + LOG_CRITICAL(HW_GPU, "Unknown depth for target={}", static_cast(params.target)); + UNREACHABLE(); + params.depth = 1; + break; + } + + params.size_in_bytes = params.SizeInBytes(); return params; } @@ -72,12 +88,12 @@ static VAddr TryGetCpuAddr(Tegra::GPUVAddr gpu_addr) { params.type = GetFormatType(params.pixel_format); params.width = config.width; params.height = config.height; - params.depth = 1; params.unaligned_height = config.height; - params.size_in_bytes = params.SizeInBytes(); params.cache_width = Common::AlignUp(params.width, 8); params.cache_height = Common::AlignUp(params.height, 8); params.target = SurfaceTarget::Texture2D; + params.depth = 1; + params.size_in_bytes = params.SizeInBytes(); return params; } @@ -93,12 +109,12 @@ static VAddr TryGetCpuAddr(Tegra::GPUVAddr gpu_addr) { params.type = GetFormatType(params.pixel_format); params.width = zeta_width; params.height = zeta_height; - params.depth = 1; params.unaligned_height = zeta_height; - params.size_in_bytes = params.SizeInBytes(); params.cache_width = Common::AlignUp(params.width, 8); params.cache_height = Common::AlignUp(params.height, 8); params.target = SurfaceTarget::Texture2D; + params.depth = 1; + params.size_in_bytes = params.SizeInBytes(); return params; }