From 60ad4b0bf0919c9dfd23aaa54271a8f1e47ab843 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 10 Apr 2009 13:21:27 -0600 Subject: [PATCH] i965: clean-up in prepare_wm_surfaces() --- src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) 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 40d6c38f4fa..095759f3a26 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -605,13 +605,11 @@ static void prepare_wm_surfaces(struct brw_context *brw ) /* Update surface / buffer for vertex shader constant buffer */ { - const GLuint surf = SURF_INDEX_VERT_CONST_BUFFER + 1; + const GLuint surf = SURF_INDEX_VERT_CONST_BUFFER; struct brw_vertex_program *vp = (struct brw_vertex_program *) brw->vertex_program; vp->const_buffer = - brw_update_constant_surface(ctx, - SURF_INDEX_VERT_CONST_BUFFER, - vp->const_buffer, + brw_update_constant_surface(ctx, surf, vp->const_buffer, vp->program.Base.Parameters); brw->wm.nr_surfaces = surf + 1; @@ -619,13 +617,11 @@ static void prepare_wm_surfaces(struct brw_context *brw ) /* Update surface / buffer for fragment shader constant buffer */ { - const GLuint surf = SURF_INDEX_FRAG_CONST_BUFFER + 1; + const GLuint surf = SURF_INDEX_FRAG_CONST_BUFFER; struct brw_fragment_program *fp = (struct brw_fragment_program *) brw->fragment_program; fp->const_buffer = - brw_update_constant_surface(ctx, - SURF_INDEX_FRAG_CONST_BUFFER, - fp->const_buffer, + brw_update_constant_surface(ctx, surf, fp->const_buffer, fp->program.Base.Parameters); brw->wm.nr_surfaces = surf + 1; -- 2.30.2