diff options
| author | Jose Fonseca <jfonseca@vmware.com> | 2015-03-18 14:21:15 +0000 |
|---|---|---|
| committer | Jose Fonseca <jfonseca@vmware.com> | 2015-03-22 08:23:23 +0000 |
| commit | d01a7cdae576162791813c131027a6e675a4e6c7 (patch) | |
| tree | 132e1880f8d48bbb14006d78c3891d7449e3b58b /src/glsl/linker.cpp | |
| parent | 7c7954b09dd28502aedb3eed312672620b9e6b7a (diff) | |
| download | external_mesa3d-d01a7cdae576162791813c131027a6e675a4e6c7.zip external_mesa3d-d01a7cdae576162791813c131027a6e675a4e6c7.tar.gz external_mesa3d-d01a7cdae576162791813c131027a6e675a4e6c7.tar.bz2 | |
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@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@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glsl/linker.cpp')
| -rw-r--r-- | src/glsl/linker.cpp | 5 |
1 files changed, 3 insertions, 2 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]; |