projects
/
profile
/
ivi
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d029ba9
)
glsl: add cast to silence signed/unsigned comparison warning
author
Brian Paul
<brianp@vmware.com>
Tue, 15 Mar 2011 15:18:40 +0000
(09:18 -0600)
committer
Brian Paul
<brianp@vmware.com>
Wed, 16 Mar 2011 00:21:35 +0000
(18:21 -0600)
src/glsl/ir.cpp
patch
|
blob
|
history
diff --git
a/src/glsl/ir.cpp
b/src/glsl/ir.cpp
index
a55b7ef
..
a3623b3
100644
(file)
--- a/
src/glsl/ir.cpp
+++ b/
src/glsl/ir.cpp
@@
-1157,7
+1157,7
@@
ir_texture::set_sampler(ir_dereference *sampler, const glsl_type *type)
this->sampler = sampler;
this->type = type;
- assert(sampler->type->sampler_type == type->base_type);
+ assert(sampler->type->sampler_type ==
(int)
type->base_type);
if (sampler->type->sampler_shadow)
assert(type->vector_elements == 4 || type->vector_elements == 1);
else