From d01a7cdae576162791813c131027a6e675a4e6c7 Mon Sep 17 00:00:00 2001 From: Jose Fonseca Date: Wed, 18 Mar 2015 14:21:15 +0000 Subject: [PATCH] glsl: Avoid GLboolean vs bool arithmetic MSVC warnings. Note that GLboolean is an alias for unsigned char, which lacks the implicit true/false semantics that C++/C99 bool have. Reviewed-by: Brian Paul v2: Change gl_shader::IsES and gl_shader_program::IsES to be bool as recommended by Ian Romanick. Reviewed-by: Brian Paul Reviewed-by: Ian Romanick --- src/glsl/linker.cpp | 5 +++-- src/mesa/main/mtypes.h | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index 0c446777970..4349f0973b9 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -2542,8 +2542,9 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog) goto done; } - prog->ARB_fragment_coord_conventions_enable |= - prog->Shaders[i]->ARB_fragment_coord_conventions_enable; + if (prog->Shaders[i]->ARB_fragment_coord_conventions_enable) { + prog->ARB_fragment_coord_conventions_enable = true; + } gl_shader_stage shader_type = prog->Shaders[i]->Stage; shader_list[shader_type][num_shaders[shader_type]] = prog->Shaders[i]; diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 1b4549415e0..8e1dba6f079 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2548,7 +2548,7 @@ struct gl_shader GLchar *Label; /**< GL_KHR_debug */ GLboolean DeletePending; GLboolean CompileStatus; - GLboolean IsES; /**< True if this shader uses GLSL ES */ + bool IsES; /**< True if this shader uses GLSL ES */ GLuint SourceChecksum; /**< for debug/logging purposes */ const GLchar *Source; /**< Source code string */ @@ -2924,7 +2924,7 @@ struct gl_shader_program GLchar *InfoLog; unsigned Version; /**< GLSL version used for linking */ - GLboolean IsES; /**< True if this program uses GLSL ES */ + bool IsES; /**< True if this program uses GLSL ES */ /** * Per-stage shaders resulting from the first stage of linking. -- 2.30.2