summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2010-06-11 00:53:05 -0700
committerEric Anholt <[email protected]>2010-06-11 12:09:26 -0700
commit34c82804edb1e9b11cf31be2246a9086694d35d6 (patch)
tree3c8a45e7bd0311d40d143bddf197afe65b595821 /src/mesa
parent53bd9796a1395e4acde884ff55cb7ee18586595a (diff)
i965: Warning fixes from the i965-streaming merge.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/brw_curbe.c2
-rw-r--r--src/mesa/drivers/dri/i965/brw_wm_surface_state.c9
2 files changed, 0 insertions, 11 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_curbe.c b/src/mesa/drivers/dri/i965/brw_curbe.c
index e6d9ac8ebbc..6c0b79f7241 100644
--- a/src/mesa/drivers/dri/i965/brw_curbe.c
+++ b/src/mesa/drivers/dri/i965/brw_curbe.c
@@ -182,8 +182,6 @@ static void prepare_constant_buffer(struct brw_context *brw)
GLcontext *ctx = &brw->intel.ctx;
const struct brw_vertex_program *vp =
brw_vertex_program_const(brw->vertex_program);
- const struct brw_fragment_program *fp =
- brw_fragment_program_const(brw->fragment_program);
const GLuint sz = brw->curbe.total_size;
const GLuint bufsz = sz * 16 * sizeof(GLfloat);
GLfloat *buf;
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index 05aa9233dcc..25b7e46dfc9 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -339,15 +339,6 @@ const struct brw_tracked_state brw_wm_constants = {
};
/**
- * Update the surface state for a WM constant buffer.
- * The constant buffer will be (re)allocated here if needed.
- */
-static void
-prepare_wm_constant_surface(GLcontext *ctx)
-{
-}
-
-/**
* Updates surface / buffer for fragment shader constant buffer, if
* one is required.
*