Mesa (master): glsl: add cast to silence signed/unsigned comparison warning

Brian Paul brianp at kemper.freedesktop.org
Wed Mar 16 02:14:47 UTC 2011


Module: Mesa
Branch: master
Commit: d350ef1682ad6432b8a10e0f6aabdfe77ccb4370
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d350ef1682ad6432b8a10e0f6aabdfe77ccb4370

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Mar 15 09:18:40 2011 -0600

glsl: add cast to silence signed/unsigned comparison warning

---

 src/glsl/ir.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp
index a55b7ef..a3623b3 100644
--- 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




More information about the mesa-commit mailing list