From c043a5c93042164c4fa2310197f6ad63f586a5d8 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 4 Aug 2018 02:54:06 -0400 Subject: [PATCH] gl_shader_manager: Amend sign differences in an assertion comparison in SetShaderUniformBlockBinding() Ensures both operands have the same sign in the comparison. While we're at it, we can get rid of the redundant casting of ub_size to an int. This type will always be trivial and alias a built-in type (not doing so would break backwards compatibility at a standard level). --- src/video_core/renderer_opengl/gl_shader_manager.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_shader_manager.cpp b/src/video_core/renderer_opengl/gl_shader_manager.cpp index e81fcbbc49..1d88f8cece 100644 --- a/src/video_core/renderer_opengl/gl_shader_manager.cpp +++ b/src/video_core/renderer_opengl/gl_shader_manager.cpp @@ -17,9 +17,8 @@ static void SetShaderUniformBlockBinding(GLuint shader, const char* name, if (ub_index != GL_INVALID_INDEX) { GLint ub_size = 0; glGetActiveUniformBlockiv(shader, ub_index, GL_UNIFORM_BLOCK_DATA_SIZE, &ub_size); - ASSERT_MSG(ub_size == expected_size, - "Uniform block size did not match! Got {}, expected {}", - static_cast(ub_size), expected_size); + ASSERT_MSG(static_cast(ub_size) == expected_size, + "Uniform block size did not match! Got {}, expected {}", ub_size, expected_size); glUniformBlockBinding(shader, ub_index, static_cast(binding)); } }