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

i965: Move sampler state to emit() time.

Browse source 
This is consumed by the WM unit, which is already at 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 11:23:59 -07:00
parent c4aaf85285
commit 9a5f8a98ed
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -329,7 +329,7 @@ static void brw_update_sampler_state(struct brw_context *brw,
* FIXME: simplify all the different new texture state flags.
*/
static void
prepare_wm_samplers(struct brw_context *brw)
brw_upload_wm_samplers(struct brw_context *brw)
{
struct gl_context *ctx = &brw->intel.ctx;
struct brw_sampler_state *samplers;
@ -363,7 +363,7 @@ const struct brw_tracked_state brw_wm_samplers = {
.brw = BRW_NEW_BATCH,
.cache = 0
},
.prepare = prepare_wm_samplers,
.emit = brw_upload_wm_samplers,
};

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

@ -184,7 +184,7 @@ gen7_update_sampler_state(struct brw_context *brw, int unit,
* FIXME: simplify all the different new texture state flags.
*/
static void
gen7_prepare_samplers(struct brw_context *brw)
gen7_upload_samplers(struct brw_context *brw)
{
struct gl_context *ctx = &brw->intel.ctx;
struct gen7_sampler_state *samplers;
@ -218,5 +218,5 @@ const struct brw_tracked_state gen7_samplers = {
.brw = BRW_NEW_BATCH,
.cache = 0
},
.prepare = gen7_prepare_samplers,
.emit = gen7_upload_samplers,
};