summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-06-08 22:40:49 +0200
committerGitHub <noreply@github.com>2018-06-08 22:40:49 +0200
commita931cf9e8b852f28d64e964c0a7d622544197f91 (patch)
tree7a950c716fcfc22563b4d986a9825dea8ef824fc /src
parentMerge pull request #546 from Subv/flush_ubo_buffer (diff)
parentGLCache: Align compressed texture sizes to their compression ratio, and then align that compressed size to the block height for tiled textures. (diff)
downloadyuzu-a931cf9e8b852f28d64e964c0a7d622544197f91.tar
yuzu-a931cf9e8b852f28d64e964c0a7d622544197f91.tar.gz
yuzu-a931cf9e8b852f28d64e964c0a7d622544197f91.tar.bz2
yuzu-a931cf9e8b852f28d64e964c0a7d622544197f91.tar.lz
yuzu-a931cf9e8b852f28d64e964c0a7d622544197f91.tar.xz
yuzu-a931cf9e8b852f28d64e964c0a7d622544197f91.tar.zst
yuzu-a931cf9e8b852f28d64e964c0a7d622544197f91.zip
Diffstat (limited to 'src')
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer_cache.cpp9
1 files changed, 7 insertions, 2 deletions
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<u32>(params.PixelsInBytes(config.tic.Pitch()));