summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Forbes <chrisf@ijw.co.nz>2013-11-17 14:57:51 +1300
committerChris Forbes <chrisf@ijw.co.nz>2013-11-17 18:56:57 +1300
commit61143b87c16231a2df0d69324d531503027f9aca (patch)
tree766a6d6b0b6071da618e5fccab9efa5ba712547b
parent0741997ff05858d7a788bd9485e3f07039b9c8f8 (diff)
downloadexternal_mesa3d-61143b87c16231a2df0d69324d531503027f9aca.zip
external_mesa3d-61143b87c16231a2df0d69324d531503027f9aca.tar.gz
external_mesa3d-61143b87c16231a2df0d69324d531503027f9aca.tar.bz2
i965: Fix broken asserts
These would never fire. Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp2
-rw-r--r--src/mesa/drivers/dri/i965/brw_vec4_vp.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp
index 5024bed..e154441 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp
@@ -418,7 +418,7 @@ ir_channel_expressions_visitor::visit_leave(ir_assignment *ir)
case ir_unop_unpack_half_2x16_split_x:
case ir_unop_unpack_half_2x16_split_y:
case ir_binop_pack_half_2x16_split:
- assert("!not reached: expression operates on scalars only");
+ assert(!"not reached: expression operates on scalars only");
break;
}
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_vp.cpp b/src/mesa/drivers/dri/i965/brw_vec4_vp.cpp
index 1f3d75c..d98bad1 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_vp.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_vp.cpp
@@ -493,7 +493,7 @@ vec4_vs_visitor::get_vp_dst_reg(const prog_dst_register &dst)
return dst_null_f();
default:
- assert("vec4_vp: bad destination register file");
+ assert(!"vec4_vp: bad destination register file");
return dst_reg(this, glsl_type::vec4_type);
}