Mesa (master): i965: Fix broken asserts
Chris Forbes
chrisf at kemper.freedesktop.org
Sun Nov 17 05:56:48 UTC 2013
Module: Mesa
Branch: master
Commit: 61143b87c16231a2df0d69324d531503027f9aca
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=61143b87c16231a2df0d69324d531503027f9aca
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Sun Nov 17 14:57:51 2013 +1300
i965: Fix broken asserts
These would never fire.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
.../dri/i965/brw_fs_channel_expressions.cpp | 2 +-
src/mesa/drivers/dri/i965/brw_vec4_vp.cpp | 2 +-
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);
}
More information about the mesa-commit
mailing list