diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-17 14:17:54 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-17 14:17:54 +0000 |
| commit | 76b655664dad149451d0abaa15929d1b7b62e0c6 (patch) | |
| tree | e7c3389fec52eaad405e2025e04555766493022c /mesalib/src/glsl/ir.cpp | |
| parent | a44b2f0d059871926ffb84dabdae53ddaa390beb (diff) | |
| parent | d7f1bd4112420f1d4b41c5409074eca6b34bf507 (diff) | |
| download | vcxsrv-76b655664dad149451d0abaa15929d1b7b62e0c6.tar.gz vcxsrv-76b655664dad149451d0abaa15929d1b7b62e0c6.tar.bz2 vcxsrv-76b655664dad149451d0abaa15929d1b7b62e0c6.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/glsl/ir.cpp')
| -rw-r--r-- | mesalib/src/glsl/ir.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp index ceb989110..7ee07f3c6 100644 --- a/mesalib/src/glsl/ir.cpp +++ b/mesalib/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
|