projects
/
platform
/
upstream
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f7bdb2f
)
glsl: add parens in shader_integer_mix() to silence compiler warning
author
Brian Paul
<brianp@vmware.com>
Tue, 5 May 2015 21:41:15 +0000
(15:41 -0600)
committer
Brian Paul
<brianp@vmware.com>
Tue, 5 May 2015 22:00:53 +0000
(16:00 -0600)
Silences gcc warning:
builtin_functions.cpp:204:23: warning: suggest parentheses around '&&'
within '||' [-Wparentheses]
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
src/glsl/builtin_functions.cpp
patch
|
blob
|
history
diff --git
a/src/glsl/builtin_functions.cpp
b/src/glsl/builtin_functions.cpp
index
1df6956
..
97055d8
100644
(file)
--- 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