diff options
| author | Eric Anholt <eric@anholt.net> | 2011-10-22 11:17:27 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2011-10-29 12:16:49 -0700 |
| commit | ab8637b03fbf2594bd1ed9ea70982b166ef991be (patch) | |
| tree | b0f0bd35bbb18a20b32a3034b6d8f4a9fb2fff99 /src/mesa/drivers/dri/i965/gen6_urb.c | |
| parent | 395a8605fa80aeef48f6d9e90d9a7c38c259120d (diff) | |
| download | external_mesa3d-ab8637b03fbf2594bd1ed9ea70982b166ef991be.zip external_mesa3d-ab8637b03fbf2594bd1ed9ea70982b166ef991be.tar.gz external_mesa3d-ab8637b03fbf2594bd1ed9ea70982b166ef991be.tar.bz2 | |
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 <kenneth@whitecape.org>
Acked-by: Paul Berry <stereotype441@gmail.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen6_urb.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_urb.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_urb.c b/src/mesa/drivers/dri/i965/gen6_urb.c index b410511..d045bf2 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, }; |