From c4aaf85285fc9484e95e9cda89db9cc6923259f4 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sat, 22 Oct 2011 10:51:34 -0700 Subject: [PATCH] i965/gen4: Move unit state setup to emit() time. It is only needed in time for brw_psp_urb_cbs(), which is also an emit(). Reviewed-by: Kenneth Graunke Acked-by: Paul Berry --- src/mesa/drivers/dri/i965/brw_clip_state.c | 4 ++-- src/mesa/drivers/dri/i965/brw_gs_state.c | 4 ++-- src/mesa/drivers/dri/i965/brw_sf_state.c | 4 ++-- src/mesa/drivers/dri/i965/brw_state_upload.c | 1 + src/mesa/drivers/dri/i965/brw_vs_state.c | 4 ++-- src/mesa/drivers/dri/i965/brw_wm_state.c | 4 ++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_clip_state.c b/src/mesa/drivers/dri/i965/brw_clip_state.c index 507b534dfd2..275a9216330 100644 --- a/src/mesa/drivers/dri/i965/brw_clip_state.c +++ b/src/mesa/drivers/dri/i965/brw_clip_state.c @@ -34,7 +34,7 @@ #include "brw_defines.h" static void -brw_prepare_clip_unit(struct brw_context *brw) +brw_upload_clip_unit(struct brw_context *brw) { struct intel_context *intel = &brw->intel; struct gl_context *ctx = &intel->ctx; @@ -124,5 +124,5 @@ const struct brw_tracked_state brw_clip_unit = { BRW_NEW_URB_FENCE), .cache = CACHE_NEW_CLIP_PROG }, - .prepare = brw_prepare_clip_unit, + .emit = brw_upload_clip_unit, }; diff --git a/src/mesa/drivers/dri/i965/brw_gs_state.c b/src/mesa/drivers/dri/i965/brw_gs_state.c index e0309e71fc3..b2845962175 100644 --- a/src/mesa/drivers/dri/i965/brw_gs_state.c +++ b/src/mesa/drivers/dri/i965/brw_gs_state.c @@ -36,7 +36,7 @@ #include "brw_defines.h" static void -brw_prepare_gs_unit(struct brw_context *brw) +brw_upload_gs_unit(struct brw_context *brw) { struct intel_context *intel = &brw->intel; struct brw_gs_unit_state *gs; @@ -95,5 +95,5 @@ const struct brw_tracked_state brw_gs_unit = { BRW_NEW_URB_FENCE), .cache = CACHE_NEW_GS_PROG }, - .prepare = brw_prepare_gs_unit, + .emit = brw_upload_gs_unit, }; diff --git a/src/mesa/drivers/dri/i965/brw_sf_state.c b/src/mesa/drivers/dri/i965/brw_sf_state.c index a8f58d9d50e..3b7a4db3ae4 100644 --- a/src/mesa/drivers/dri/i965/brw_sf_state.c +++ b/src/mesa/drivers/dri/i965/brw_sf_state.c @@ -119,7 +119,7 @@ const struct brw_tracked_state brw_sf_vp = { .brw = BRW_NEW_BATCH, .cache = 0 }, - .prepare = upload_sf_vp + .emit = upload_sf_vp }; /** @@ -324,5 +324,5 @@ const struct brw_tracked_state brw_sf_unit = { .cache = (CACHE_NEW_SF_VP | CACHE_NEW_SF_PROG) }, - .prepare = upload_sf_unit, + .emit = upload_sf_unit, }; diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c index 2737feef89a..4d95f7849ba 100644 --- a/src/mesa/drivers/dri/i965/brw_state_upload.c +++ b/src/mesa/drivers/dri/i965/brw_state_upload.c @@ -72,6 +72,7 @@ static const struct brw_tracked_state *gen4_atoms[] = &brw_wm_binding_table, &brw_wm_samplers, + /* These set up state for brw_psp_urb_cbs */ &brw_wm_unit, &brw_sf_vp, &brw_sf_unit, diff --git a/src/mesa/drivers/dri/i965/brw_vs_state.c b/src/mesa/drivers/dri/i965/brw_vs_state.c index f018fc6691d..5a9032caf4e 100644 --- a/src/mesa/drivers/dri/i965/brw_vs_state.c +++ b/src/mesa/drivers/dri/i965/brw_vs_state.c @@ -37,7 +37,7 @@ #include "main/macros.h" static void -brw_prepare_vs_unit(struct brw_context *brw) +brw_upload_vs_unit(struct brw_context *brw) { struct intel_context *intel = &brw->intel; struct gl_context *ctx = &intel->ctx; @@ -181,5 +181,5 @@ const struct brw_tracked_state brw_vs_unit = { BRW_NEW_VERTEX_PROGRAM), .cache = CACHE_NEW_VS_PROG }, - .prepare = brw_prepare_vs_unit, + .emit = brw_upload_vs_unit, }; diff --git a/src/mesa/drivers/dri/i965/brw_wm_state.c b/src/mesa/drivers/dri/i965/brw_wm_state.c index b66fb92e8f5..51ef745b241 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_state.c @@ -71,7 +71,7 @@ brw_color_buffer_write_enabled(struct brw_context *brw) * Setup wm hardware state. See page 225 of Volume 2 */ static void -brw_prepare_wm_unit(struct brw_context *brw) +brw_upload_wm_unit(struct brw_context *brw) { struct intel_context *intel = &brw->intel; struct gl_context *ctx = &intel->ctx; @@ -269,6 +269,6 @@ const struct brw_tracked_state brw_wm_unit = { .cache = (CACHE_NEW_WM_PROG | CACHE_NEW_SAMPLER) }, - .prepare = brw_prepare_wm_unit, + .emit = brw_upload_wm_unit, }; -- 2.30.2