fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-26 07:50:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965/gen4: Move unit state setup to emit() time.

Browse source 
It is only needed in time for brw_psp_urb_cbs(), which is also an emit().

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Paul Berry <stereotype441@gmail.com>
This commit is contained in:
Eric Anholt 2011-10-22 10:51:34 -07:00
parent c0574d5a90
commit c4aaf85285
6 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/drivers/dri/i965/brw_clip_state.c
View file

@ -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,
};

4
src/mesa/drivers/dri/i965/brw_gs_state.c
View file

@ -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,
};

4
src/mesa/drivers/dri/i965/brw_sf_state.c
View file

@ -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,
};

1
src/mesa/drivers/dri/i965/brw_state_upload.c
View file

@ -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,

4
src/mesa/drivers/dri/i965/brw_vs_state.c
View file

@ -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,
};

4
src/mesa/drivers/dri/i965/brw_wm_state.c
View file

@ -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,
};