i965: Assign instead of compare inside assert
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 30 Sep 2011 20:58:59 +0000 (21:58 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Fri, 30 Sep 2011 21:00:05 +0000 (22:00 +0100)
This is from a Coverity defect report.

src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
  1314  void
  1315  vec4_visitor::emit_block_move(dst_reg *dst, src_reg *src,
  1316                                const struct glsl_type *type, bool
predicated)
...
  1351     /* Do we need to worry about swizzling a swizzle? */
->1352     assert(src->swizzle = BRW_SWIZZLE_NOOP);
  1353     src->swizzle = swizzle_for_size(type->vector_elements);

Reported-by: Vinson Lee <vlee@vmware.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=40158
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp

index 98ecd251ddfd1954766ab1c5dd3c2f32801accf7..5815e31732ee766f6ac443ab18ef89867370fecf 100644 (file)
@@ -1472,7 +1472,7 @@ vec4_visitor::emit_block_move(dst_reg *dst, src_reg *src,
    dst->writemask = (1 << type->vector_elements) - 1;
 
    /* Do we need to worry about swizzling a swizzle? */
-   assert(src->swizzle = BRW_SWIZZLE_NOOP);
+   assert(src->swizzle == BRW_SWIZZLE_NOOP);
    src->swizzle = swizzle_for_size(type->vector_elements);
 
    vec4_instruction *inst = emit(MOV(*dst, *src));