Merge pull request #3580 from daniellimws/common-fmt

common: Migrate logging macros
This commit is contained in:
Weiyi Wang 2018-04-06 12:38:08 +03:00 committed by GitHub
commit a9544ca015
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 132 additions and 134 deletions

View file

@ -1308,7 +1308,7 @@ void RasterizerOpenGL::SetShader() {
glGetActiveUniformBlockiv(current_shader->shader.handle, block_index,
GL_UNIFORM_BLOCK_DATA_SIZE, &block_size);
ASSERT_MSG(block_size == sizeof(UniformData),
"Uniform block size did not match! Got %d, expected %zu",
"Uniform block size did not match! Got {}, expected {}",
static_cast<int>(block_size), sizeof(UniformData));
glUniformBlockBinding(current_shader->shader.handle, block_index, 0);
}