summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2014-08-11 11:12:43 -0700
committerMatt Turner <mattst88@gmail.com>2014-08-12 11:09:45 -0700
commite005c1148db04cb706a65392c2b0beda19efa0b1 (patch)
treedb009e770a400c82f473a5c79f95505530259d33 /src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
parentab66b196699b80cc32cf00fa7cd794cfa992cf3c (diff)
downloadexternal_mesa3d-e005c1148db04cb706a65392c2b0beda19efa0b1.zip
external_mesa3d-e005c1148db04cb706a65392c2b0beda19efa0b1.tar.gz
external_mesa3d-e005c1148db04cb706a65392c2b0beda19efa0b1.tar.bz2
i965: Return NONE from brw_swap_cmod on unknown input.
Comparing ~0u with a packed enum (i.e., 1 byte) always evaluates to false. Shouldn't gcc warn about this? Reported-by: Connor Abbott <cwabbott0@gmail.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp')
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp b/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
index 0716202..498e078 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
@@ -440,7 +440,7 @@ try_constant_propagate(struct brw_context *brw, fs_inst *inst,
enum brw_conditional_mod new_cmod;
new_cmod = brw_swap_cmod(inst->conditional_mod);
- if (new_cmod != ~0u) {
+ if (new_cmod != BRW_CONDITIONAL_NONE) {
/* Fit this constant in by swapping the operands and
* flipping the test
*/