Mesa (master): glsl: Avoid GLboolean vs bool arithmetic MSVC warnings.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Sun Mar 22 08:23:36 UTC 2015
Module: Mesa
Branch: master
Commit: d01a7cdae576162791813c131027a6e675a4e6c7
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d01a7cdae576162791813c131027a6e675a4e6c7
Author: Jose Fonseca <jfonseca at vmware.com>
Date: Wed Mar 18 14:21:15 2015 +0000
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 <brianp at vmware.com>
v2: Change gl_shader::IsES and gl_shader_program::IsES to be bool as
recommended by Ian Romanick.
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
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 0c44677..4349f09 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 1b45494..8e1dba6 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.
More information about the mesa-commit
mailing list