Mesa (master): i965: remove unused variable since brw_wm_glsl.c removal.
Eric Anholt
anholt at kemper.freedesktop.org
Thu Dec 9 19:24:35 UTC 2010
Module: Mesa
Branch: master
Commit: 834cc8e501c2632fd8f9fc78502a1a99803e6fb9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=834cc8e501c2632fd8f9fc78502a1a99803e6fb9
Author: Eric Anholt <eric at anholt.net>
Date: Thu Dec 9 11:10:31 2010 -0800
i965: remove unused variable since brw_wm_glsl.c removal.
---
src/mesa/drivers/dri/i965/brw_structs.h | 2 +-
src/mesa/drivers/dri/i965/brw_wm_state.c | 1 -
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_structs.h b/src/mesa/drivers/dri/i965/brw_structs.h
index d341187..461f270 100644
--- a/src/mesa/drivers/dri/i965/brw_structs.h
+++ b/src/mesa/drivers/dri/i965/brw_structs.h
@@ -1178,7 +1178,7 @@ struct brw_surface_state
GLuint cube_neg_y:1;
GLuint cube_pos_x:1;
GLuint cube_neg_x:1;
- GLuint pad:4;
+ GLuint pad:2;
/* Required on gen6 for surfaces accessed through render cache messages.
*/
GLuint render_cache_read_write:1;
diff --git a/src/mesa/drivers/dri/i965/brw_wm_state.c b/src/mesa/drivers/dri/i965/brw_wm_state.c
index 8283547..e9ef635 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_state.c
@@ -87,7 +87,6 @@ wm_unit_populate_key(struct brw_context *brw, struct brw_wm_unit_key *key)
{
struct gl_context *ctx = &brw->intel.ctx;
const struct gl_fragment_program *fp = brw->fragment_program;
- const struct brw_fragment_program *bfp = (struct brw_fragment_program *) fp;
struct intel_context *intel = &brw->intel;
memset(key, 0, sizeof(*key));
More information about the mesa-commit
mailing list