Mesa (master): glsl: add parens in shader_integer_mix() to silence compiler warning

[Brian Paul]

Module: Mesa
Branch: master
Commit: 0beaf1cd9a9a882b4f896dc1865622d72488ff31
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0beaf1cd9a9a882b4f896dc1865622d72488ff31

Author: Brian Paul <brianp at vmware.com>
Date:   Tue May  5 15:41:15 2015 -0600

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 at alum.mit.edu>

---

 src/glsl/builtin_functions.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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