diff options
| author | Marek Olšák <[email protected]> | 2015-05-18 14:56:34 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2015-05-26 12:42:37 +0200 |
| commit | fa7f606e89dc4447f07fec0b84d396a4ff25ee7e (patch) | |
| tree | 588e067934127285b1ff66bd100b50632f451014 | |
| parent | f41517242aaad3cb67fb7f6c9a03dc34198ca500 (diff) | |
radeonsi: fix scratch buffer setup for geometry shaders
Cc: 10.6 <[email protected]>
Reviewed-by: Michel Dänzer <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_shaders.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index 25811ab413d..610af948f12 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -841,8 +841,15 @@ static void si_update_spi_tmpring_size(struct si_context *sctx) si_pm4_bind_state(sctx, ps, sctx->ps_shader->current->pm4); if (si_update_scratch_buffer(sctx, sctx->gs_shader)) si_pm4_bind_state(sctx, gs, sctx->gs_shader->current->pm4); - if (si_update_scratch_buffer(sctx, sctx->vs_shader)) - si_pm4_bind_state(sctx, vs, sctx->vs_shader->current->pm4); + + /* VS can be bound as ES or VS. */ + if (sctx->gs_shader) { + if (si_update_scratch_buffer(sctx, sctx->vs_shader)) + si_pm4_bind_state(sctx, es, sctx->vs_shader->current->pm4); + } else { + if (si_update_scratch_buffer(sctx, sctx->vs_shader)) + si_pm4_bind_state(sctx, vs, sctx->vs_shader->current->pm4); + } } /* The LLVM shader backend should be reporting aligned scratch_sizes. */ |