projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7a49bd6
)
i965g: fix some asserts
author
Keith Whitwell
<keithw@vmware.com>
Wed, 4 Nov 2009 23:33:08 +0000
(23:33 +0000)
committer
Keith Whitwell
<keithw@vmware.com>
Wed, 4 Nov 2009 23:33:08 +0000
(23:33 +0000)
src/gallium/drivers/i965/brw_state_upload.c
patch
|
blob
|
history
diff --git
a/src/gallium/drivers/i965/brw_state_upload.c
b/src/gallium/drivers/i965/brw_state_upload.c
index 4132c6ac69b7da1044b9859044c17f2d9a9a465d..a71af4d2b91d01878e099c32977a8415edbda443 100644
(file)
--- 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);
}
}