diff options
| author | Francisco Jerez <[email protected]> | 2016-01-16 15:05:51 -0800 |
|---|---|---|
| committer | Francisco Jerez <[email protected]> | 2016-01-19 16:11:04 -0800 |
| commit | 9e4c8acd7814186673c4945c7045124ebbcd125f (patch) | |
| tree | 234e59573f6524d088c9cd391889051e90db0cc4 | |
| parent | 4fc018576b577ed9ab3b713ba21727479a0e8b23 (diff) | |
i965: Trigger CS state reemission when new sampler state is uploaded.
This reuses the NEW_SAMPLER_STATE_TABLE state bit (currently only used
on pre-Gen7 hardware) to signal that the sampler state tables have
changed in order to make sure that the GPGPU interface descriptor is
updated.
Reviewed-by: Marta Lofstedt <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_sampler_state.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_cs_state.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_sampler_state.c b/src/mesa/drivers/dri/i965/brw_sampler_state.c index d181468f5cb..24798a5c552 100644 --- a/src/mesa/drivers/dri/i965/brw_sampler_state.c +++ b/src/mesa/drivers/dri/i965/brw_sampler_state.c @@ -582,7 +582,7 @@ brw_upload_sampler_state_table(struct brw_context *brw, batch_offset_for_sampler_state += size_in_bytes; } - if (brw->gen >= 7) { + if (brw->gen >= 7 && stage_state->stage != MESA_SHADER_COMPUTE) { /* Emit a 3DSTATE_SAMPLER_STATE_POINTERS_XS packet. */ gen7_emit_sampler_state_pointers_xs(brw, stage_state); } else { diff --git a/src/mesa/drivers/dri/i965/gen7_cs_state.c b/src/mesa/drivers/dri/i965/gen7_cs_state.c index a025bb9dd66..6d6988c6a41 100644 --- a/src/mesa/drivers/dri/i965/gen7_cs_state.c +++ b/src/mesa/drivers/dri/i965/gen7_cs_state.c @@ -196,6 +196,7 @@ const struct brw_tracked_state brw_cs_state = { .brw = BRW_NEW_BATCH | BRW_NEW_CS_PROG_DATA | BRW_NEW_PUSH_CONSTANT_ALLOCATION | + BRW_NEW_SAMPLER_STATE_TABLE | BRW_NEW_SURFACES, }, .emit = brw_upload_cs_state |