From: Eric Anholt Date: Sat, 22 Oct 2011 18:18:56 +0000 (-0700) Subject: i965/gen6: Move viewport state setup to emit() time. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=752cad8f33ad1adc8950e5c0b5c9c4aa2ad046ec;p=mesa.git i965/gen6: Move viewport state setup to emit() time. Only the emit() for the pointers into the batch later in this file cares. Reviewed-by: Kenneth Graunke Acked-by: Paul Berry --- diff --git a/src/mesa/drivers/dri/i965/gen6_viewport_state.c b/src/mesa/drivers/dri/i965/gen6_viewport_state.c index ab378d3fc0e..9ff2bd95680 100644 --- a/src/mesa/drivers/dri/i965/gen6_viewport_state.c +++ b/src/mesa/drivers/dri/i965/gen6_viewport_state.c @@ -39,7 +39,7 @@ * up in the guardband or not. */ static void -prepare_clip_vp(struct brw_context *brw) +gen6_upload_clip_vp(struct brw_context *brw) { struct brw_clipper_viewport *vp; @@ -60,11 +60,11 @@ const struct brw_tracked_state gen6_clip_vp = { .brw = BRW_NEW_BATCH, .cache = 0, }, - .prepare = prepare_clip_vp, + .emit = gen6_upload_clip_vp, }; static void -prepare_sf_vp(struct brw_context *brw) +gen6_upload_sf_vp(struct brw_context *brw) { struct gl_context *ctx = &brw->intel.ctx; const GLfloat depth_scale = 1.0F / ctx->DrawBuffer->_DepthMaxF; @@ -103,7 +103,7 @@ const struct brw_tracked_state gen6_sf_vp = { .brw = BRW_NEW_BATCH, .cache = 0, }, - .prepare = prepare_sf_vp, + .emit = gen6_upload_sf_vp, }; static void upload_viewport_state_pointers(struct brw_context *brw)