From: Brian Paul <brianp@vmware.com>
Date: Tue, 5 May 2015 21:41:15 +0000 (-0600)
Subject: glsl: add parens in shader_integer_mix() to silence compiler warning
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0beaf1cd9a9a882b4f896dc1865622d72488ff31;p=mesa.git

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>
---

diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp
index 1df69561f7b..97055d85d58 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