projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
61efad6
)
glsl: use casts to silence warning
author
Brian Paul
<brianp@vmware.com>
Thu, 7 Jul 2011 22:47:59 +0000
(16:47 -0600)
committer
Brian Paul
<brianp@vmware.com>
Thu, 7 Jul 2011 23:28:48 +0000
(17:28 -0600)
src/glsl/linker.cpp
patch
|
blob
|
history
diff --git
a/src/glsl/linker.cpp
b/src/glsl/linker.cpp
index 265da84e5a911c121acdf3ce10c6a280a7bd5c35..34b64837a46ef12a6d0c38e48bf917f3f967c44f 100644
(file)
--- a/
src/glsl/linker.cpp
+++ b/
src/glsl/linker.cpp
@@
-1248,7
+1248,7
@@
assign_attribute_or_color_locations(gl_shader_program *prog,
*/
const int generic_base = (target_index == MESA_SHADER_VERTEX)
-
? VERT_ATTRIB_GENERIC0 :
FRAG_RESULT_DATA0;
+
? (int) VERT_ATTRIB_GENERIC0 : (int)
FRAG_RESULT_DATA0;
const enum ir_variable_mode direction =
(target_index == MESA_SHADER_VERTEX) ? ir_var_in : ir_var_out;