Module: Mesa
Branch: i965g-restart
Commit: e84e86ecb2e83b756a0153d315f946d60d695a54
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e84e86ecb2e83b756a0153d315f946d60d695a54

Author: Keith Whitwell <[email protected]>
Date:   Wed Nov  4 23:33:08 2009 +0000

i965g: fix some asserts

---

 src/gallium/drivers/i965/brw_state_upload.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/i965/brw_state_upload.c 
b/src/gallium/drivers/i965/brw_state_upload.c
index 4132c6a..a71af4d 100644
--- a/src/gallium/drivers/i965/brw_state_upload.c
+++ b/src/gallium/drivers/i965/brw_state_upload.c
@@ -193,8 +193,8 @@ enum pipe_error brw_validate_state( struct brw_context *brw 
)
    {
       const struct brw_fragment_shader *fp = brw->curr.fragment_shader;
       if (fp) {
-         assert(fp->info.file_max[TGSI_FILE_SAMPLER] < brw->curr.num_samplers 
&&
-               fp->info.texture_max < brw->curr.num_textures);
+         assert(fp->info.file_max[TGSI_FILE_SAMPLER] < 
(int)brw->curr.num_samplers);
+        assert(fp->info.texture_max <= brw->curr.num_textures);
       }
    }
 

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to