diff options
| author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-04-08 22:26:34 +0200 |
|---|---|---|
| committer | FernandoS27 <fsahmkow27@gmail.com> | 2019-04-08 23:16:02 +0200 |
| commit | 9f168330974b474225b8fa6bb8d0dac0d1951325 (patch) | |
| tree | aaa14639d08c9abaf1733ffd861d34d872cb503a /src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | |
| parent | Merge pull request #2300 from FernandoS27/null-shader (diff) | |
| download | yuzu-9f168330974b474225b8fa6bb8d0dac0d1951325.tar yuzu-9f168330974b474225b8fa6bb8d0dac0d1951325.tar.gz yuzu-9f168330974b474225b8fa6bb8d0dac0d1951325.tar.bz2 yuzu-9f168330974b474225b8fa6bb8d0dac0d1951325.tar.lz yuzu-9f168330974b474225b8fa6bb8d0dac0d1951325.tar.xz yuzu-9f168330974b474225b8fa6bb8d0dac0d1951325.tar.zst yuzu-9f168330974b474225b8fa6bb8d0dac0d1951325.zip | |
Diffstat (limited to 'src/video_core/renderer_opengl/gl_rasterizer_cache.cpp')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 8 |
1 files changed, 4 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 7a3280620..5876145ef 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -661,8 +661,8 @@ void CachedSurface::FlushGLBuffer() { gl_buffer[0].resize(GetSizeInBytes()); const FormatTuple& tuple = GetFormatTuple(params.pixel_format, params.component_type); - // Ensure no bad interactions with GL_UNPACK_ALIGNMENT - ASSERT(params.width * GetBytesPerPixel(params.pixel_format) % 4 == 0); + const u32 align = std::clamp(params.RowAlign(0), 1U, 8U); + glPixelStorei(GL_PACK_ALIGNMENT, align); glPixelStorei(GL_PACK_ROW_LENGTH, static_cast<GLint>(params.width)); ASSERT(!tuple.compressed); glBindBuffer(GL_PIXEL_PACK_BUFFER, 0); @@ -707,8 +707,8 @@ void CachedSurface::UploadGLMipmapTexture(u32 mip_map, GLuint read_fb_handle, const FormatTuple& tuple = GetFormatTuple(params.pixel_format, params.component_type); - // Ensure no bad interactions with GL_UNPACK_ALIGNMENT - ASSERT(params.MipWidth(mip_map) * GetBytesPerPixel(params.pixel_format) % 4 == 0); + const u32 align = std::clamp(params.RowAlign(mip_map), 1U, 8U); + glPixelStorei(GL_UNPACK_ALIGNMENT, align); glPixelStorei(GL_UNPACK_ROW_LENGTH, static_cast<GLint>(params.MipWidth(mip_map))); const auto image_size = static_cast<GLsizei>(params.GetMipmapSizeGL(mip_map, false)); |