summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernandoS27 <fsahmkow27@gmail.com>2018-10-26 16:17:29 -0400
committerFernandoS27 <fsahmkow27@gmail.com>2018-10-28 19:00:04 -0400
commit87f8181405cd09da15e7d1eb4a64024431fc0957 (patch)
tree836d36964b76f98dc9d624ad1bb433815b447d31
parentf4432b5d0cb0cb89ff4af8172720f7457514d981 (diff)
Fixed Invalid Image size and Mipmap calculation
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer_cache.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
index cbe5bf664..4d89d0f67 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
@@ -95,10 +95,13 @@ std::size_t SurfaceParams::InnerMipmapMemorySize(u32 mip_level, bool force_gl, b
const u32 compression_factor{GetCompressionFactor(pixel_format)};
const u32 bytes_per_pixel{GetBytesPerPixel(pixel_format)};
u32 m_depth = (layer_only ? 1U : depth);
- u32 m_width = uncompressed ? width : std::max(1U, width / compression_factor);
- u32 m_height = uncompressed ? height : std::max(1U, height / compression_factor);
- m_width = std::max(1U, m_width >> mip_level);
- m_height = std::max(1U, m_height >> mip_level);
+ u32 m_width = MipWidth(mip_level);
+ u32 m_height = MipHeight(mip_level);
+ m_width = uncompressed ? m_width
+ : std::max(1U, (m_width + compression_factor - 1) / compression_factor);
+ m_height = uncompressed
+ ? m_height
+ : std::max(1U, (m_height + compression_factor - 1) / compression_factor);
m_depth = std::max(1U, m_depth >> mip_level);
u32 m_block_height = MipBlockHeight(mip_level, m_height);
u32 m_block_depth = MipBlockDepth(mip_level);