summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2013-04-11 10:06:06 -0700
committerEric Anholt <[email protected]>2013-04-12 16:32:12 -0700
commit331766b9a20bdde5e10adfb0443477e5c43a14dd (patch)
tree70f95c20b7998b9880fc567b5b32940ac44feb9c /src/mesa/drivers
parentadf251406b5cf5e74f88c91799228dd9cc8dac29 (diff)
i830: Move assert-only code into the assert.
The call has no side effects, and moving it into the assert cleans up a compile warning in the release build. Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/i915/i830_vtbl.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i915/i830_vtbl.c b/src/mesa/drivers/dri/i915/i830_vtbl.c
index 6019852bf6c..b30f45edfa8 100644
--- a/src/mesa/drivers/dri/i915/i830_vtbl.c
+++ b/src/mesa/drivers/dri/i915/i830_vtbl.c
@@ -179,8 +179,6 @@ i830_render_start(struct intel_context *intel)
v2 != i830->state.Ctx[I830_CTXREG_VF2] ||
mcsb1 != i830->state.Ctx[I830_CTXREG_MCSB1] ||
index_bitset != i830->last_index_bitset) {
- int k;
-
I830_STATECHANGE(i830, I830_UPLOAD_CTX);
/* Must do this *after* statechange, so as not to affect
@@ -199,8 +197,7 @@ i830_render_start(struct intel_context *intel)
i830->state.Ctx[I830_CTXREG_MCSB1] = mcsb1;
i830->last_index_bitset = index_bitset;
- k = i830_check_vertex_size(intel, intel->vertex_size);
- assert(k);
+ assert(i830_check_vertex_size(intel, intel->vertex_size));
}
}