summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2013-04-11 10:37:13 -0700
committerEric Anholt <[email protected]>2013-04-12 16:32:14 -0700
commitdea70404eb615bfa148fbd0fec5670fb2657c47b (patch)
treeee57d252f21cc039f7f074279246598838ad0202 /src/mesa/drivers/dri
parent28170c5b7f1feaa5918f4f5427435b0ad53a8c2f (diff)
i965: Fix a warning in the release build.
This was copy and pasted from can_reswizzle_dst(), and we can just fold it in instead to avoid the warning. Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/i965/brw_vec4.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp
index dc7865ff654..b0527c7b31e 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp
@@ -806,7 +806,6 @@ vec4_instruction::reswizzle_dst(int dst_writemask, int swizzle)
break;
default:
for (int c = 0; c < 4; c++) {
- int bit = 1 << BRW_GET_SWZ(swizzle, c);
/* Skip components of the swizzle not used by the dst. */
if (!(dst_writemask & (1 << c)))
continue;
@@ -814,7 +813,7 @@ vec4_instruction::reswizzle_dst(int dst_writemask, int swizzle)
/* We don't do the reswizzling yet, so just sanity check that we
* don't have to.
*/
- assert(bit == (1 << c));
+ assert((1 << BRW_GET_SWZ(swizzle, c)) == (1 << c));
}
break;
}