diff options
| author | Brian Paul <brianp@vmware.com> | 2015-05-05 15:41:15 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2015-05-05 16:00:53 -0600 |
| commit | 0beaf1cd9a9a882b4f896dc1865622d72488ff31 (patch) | |
| tree | a38af4819ee5b5b0220e13418f8e1b23a4683c1f | |
| parent | f7bdb2f3724808d6a280471847300abe192d4f5a (diff) | |
| download | external_mesa3d-0beaf1cd9a9a882b4f896dc1865622d72488ff31.zip external_mesa3d-0beaf1cd9a9a882b4f896dc1865622d72488ff31.tar.gz external_mesa3d-0beaf1cd9a9a882b4f896dc1865622d72488ff31.tar.bz2 | |
glsl: add parens in shader_integer_mix() to silence compiler warning
Silences gcc warning:
builtin_functions.cpp:204:23: warning: suggest parentheses around '&&'
within '||' [-Wparentheses]
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
| -rw-r--r-- | src/glsl/builtin_functions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp index 1df6956..97055d8 100644 --- a/src/glsl/builtin_functions.cpp +++ b/src/glsl/builtin_functions.cpp @@ -201,7 +201,7 @@ static bool shader_integer_mix(const _mesa_glsl_parse_state *state) { return state->is_version(450, 310) || - v130(state) && state->EXT_shader_integer_mix_enable; + (v130(state) && state->EXT_shader_integer_mix_enable); } static bool |