Re: [Mesa-dev] [PATCH 3/3] i965: Fix broken asserts

2013-11-16 Thread Kenneth Graunke 
On 11/16/2013 06:00 PM, Chris Forbes wrote:
> These would never fire.
> 
> Signed-off-by: Chris Forbes 
> ---
>  src/mesa/drivers/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);
> }
>  
> 

All three are:
Reviewed-by: Kenneth Graunke 
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 3/3] i965: Fix broken asserts

2013-11-16 Thread Chris Forbes 
These would never fire.

Signed-off-by: Chris Forbes 
---
 src/mesa/drivers/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);
}
 
-- 
1.8.4.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev