From ab8637b03fbf2594bd1ed9ea70982b166ef991be Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sat, 22 Oct 2011 11:17:27 -0700 Subject: i965: Fold the gen6/7 URB state prepare()/emit() together. No other unit cares about the prepare state, unlike gen4-5. Reviewed-by: Kenneth Graunke Acked-by: Paul Berry --- src/mesa/drivers/dri/i965/gen6_urb.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/mesa/drivers/dri/i965/gen6_urb.c') diff --git a/src/mesa/drivers/dri/i965/gen6_urb.c b/src/mesa/drivers/dri/i965/gen6_urb.c index b4105111c8c..d045bf28ec2 100644 --- a/src/mesa/drivers/dri/i965/gen6_urb.c +++ b/src/mesa/drivers/dri/i965/gen6_urb.c @@ -32,8 +32,9 @@ #include "brw_defines.h" static void -prepare_urb( struct brw_context *brw ) +gen6_upload_urb( struct brw_context *brw ) { + struct intel_context *intel = &brw->intel; int nr_vs_entries; /* CACHE_NEW_VS_PROG */ @@ -53,12 +54,6 @@ prepare_urb( struct brw_context *brw ) */ brw->urb.nr_gs_entries = 0; brw->urb.gs_size = 1; /* Incorrect, but with 0 GS entries it doesn't matter. */ -} - -static void -upload_urb(struct brw_context *brw) -{ - struct intel_context *intel = &brw->intel; assert(brw->urb.nr_vs_entries >= 24); assert(brw->urb.nr_vs_entries % 4 == 0); @@ -81,6 +76,5 @@ const struct brw_tracked_state gen6_urb = { .brw = BRW_NEW_CONTEXT, .cache = (CACHE_NEW_VS_PROG | CACHE_NEW_GS_PROG), }, - .prepare = prepare_urb, - .emit = upload_urb, + .emit = gen6_upload_urb, }; -- cgit v1.2.3