From d67c08319fda7d0f2df98d60b64c8cc2f3e06c44 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 22 Apr 2011 13:44:00 -0700 Subject: i965: Move the CC VP to state streaming. This is in a way a revert of f5bb775fd1f333d8e579d07a5cac1ded2bd54a2f. The tiny win that had will be overwhelmed by the win of using the gen6 dynamic state base address. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/gen6_viewport_state.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/mesa/drivers/dri/i965/gen6_viewport_state.c') diff --git a/src/mesa/drivers/dri/i965/gen6_viewport_state.c b/src/mesa/drivers/dri/i965/gen6_viewport_state.c index 32fdd95..c46dc3e 100644 --- a/src/mesa/drivers/dri/i965/gen6_viewport_state.c +++ b/src/mesa/drivers/dri/i965/gen6_viewport_state.c @@ -104,11 +104,6 @@ const struct brw_tracked_state gen6_sf_vp = { .prepare = prepare_sf_vp, }; -static void prepare_viewport_state_pointers(struct brw_context *brw) -{ - brw_add_validated_bo(brw, brw->cc.vp_bo); -} - static void upload_viewport_state_pointers(struct brw_context *brw) { struct intel_context *intel = &brw->intel; @@ -122,7 +117,8 @@ static void upload_viewport_state_pointers(struct brw_context *brw) brw->clip.vp_offset); OUT_RELOC(intel->batch.bo, I915_GEM_DOMAIN_INSTRUCTION, 0, brw->sf.vp_offset); - OUT_RELOC(brw->cc.vp_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0); + OUT_RELOC(intel->batch.bo, I915_GEM_DOMAIN_INSTRUCTION, 0, + brw->cc.vp_offset); ADVANCE_BATCH(); } @@ -134,6 +130,5 @@ const struct brw_tracked_state gen6_viewport_state = { CACHE_NEW_SF_VP | CACHE_NEW_CC_VP) }, - .prepare = prepare_viewport_state_pointers, .emit = upload_viewport_state_pointers, }; -- cgit v1.1