From 8d9534d830226f7095796da8358ef980f46af32e Mon Sep 17 00:00:00 2001 From: Subv Date: Fri, 8 Jun 2018 12:27:19 -0500 Subject: GLCache: Align compressed texture sizes to their compression ratio, and then align that compressed size to the block height for tiled textures. This fixes issues with retrieving non-block-aligned tiled compressed textures from the cache. --- src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/video_core') diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index df2474ea2..ff48a2669 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -1033,8 +1033,11 @@ Surface RasterizerCacheOpenGL::GetTextureSurface(const Tegra::Texture::FullTextu params.addr = config.tic.Address(); params.is_tiled = config.tic.IsTiled(); params.pixel_format = SurfaceParams::PixelFormatFromTextureFormat(config.tic.format); - params.width = config.tic.Width() / params.GetCompresssionFactor(); - params.height = config.tic.Height() / params.GetCompresssionFactor(); + + params.width = Common::AlignUp(config.tic.Width(), params.GetCompresssionFactor()) / + params.GetCompresssionFactor(); + params.height = Common::AlignUp(config.tic.Height(), params.GetCompresssionFactor()) / + params.GetCompresssionFactor(); // TODO(Subv): Different types per component are not supported. ASSERT(config.tic.r_type.Value() == config.tic.g_type.Value() && @@ -1045,6 +1048,8 @@ Surface RasterizerCacheOpenGL::GetTextureSurface(const Tegra::Texture::FullTextu if (config.tic.IsTiled()) { params.block_height = config.tic.BlockHeight(); + params.width = Common::AlignUp(params.width, params.block_height); + params.height = Common::AlignUp(params.height, params.block_height); } else { // Use the texture-provided stride value if the texture isn't tiled. params.stride = static_cast(params.PixelsInBytes(config.tic.Pitch())); -- cgit v1.2.3