Module: Mesa
Branch: master
Commit: 282f67becd072068147c95f26d9c705acf1bbe1b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=282f67becd072068147c95f26d9c705acf1bbe1b
Author: Vinson Lee <v...@freedesktop.org>
Date: Fri Mar 6 21:52:31 2015 -0800
i915: Fix GCC unused-but-set-variable warning in release build.
i915_fragprog.c: In function ‘i915ValidateFragmentProgram’:
i915_fragprog.c:1453:11: warning: variable ‘k’ set but not used
[-Wunused-but-set-variable]
int k;
^
Signed-off-by: Vinson Lee <v...@freedesktop.org>
Reviewed-by: Anuj Phogat <anuj.pho...@gmail.com>
---
src/mesa/drivers/dri/i915/i915_fragprog.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/mesa/drivers/dri/i915/i915_fragprog.c
b/src/mesa/drivers/dri/i915/i915_fragprog.c
index d42da5a..9b00223 100644
--- a/src/mesa/drivers/dri/i915/i915_fragprog.c
+++ b/src/mesa/drivers/dri/i915/i915_fragprog.c
@@ -1450,8 +1450,6 @@ i915ValidateFragmentProgram(struct i915_context *i915)
if (s2 != i915->state.Ctx[I915_CTXREG_LIS2] ||
s4 != i915->state.Ctx[I915_CTXREG_LIS4]) {
- int k;
-
I915_STATECHANGE(i915, I915_UPLOAD_CTX);
/* Must do this *after* statechange, so as not to affect
@@ -1471,8 +1469,7 @@ i915ValidateFragmentProgram(struct i915_context *i915)
i915->state.Ctx[I915_CTXREG_LIS2] = s2;
i915->state.Ctx[I915_CTXREG_LIS4] = s4;
- k = intel->vtbl.check_vertex_size(intel, intel->vertex_size);
- assert(k);
+ assert(intel->vtbl.check_vertex_size(intel, intel->vertex_size));
}
if (!p->params_uptodate)
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
