diff options
| author | Dave Airlie <[email protected]> | 2015-11-30 11:14:26 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2015-12-07 09:58:59 +1000 |
| commit | 8a0e21fc5aa2b9a096b1eec1182b536a6e303a89 (patch) | |
| tree | be9fd8ec049197ea418bfaad5d09d0d87f2aa50b /src/gallium | |
| parent | 3a7232a9a9ef9823a3581f0e02f732ca0e134638 (diff) | |
r600: move selecting shaders into earlier code.
select the ps/gs/vs in that order then process the results.
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/r600/r600_state_common.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index 68b1a4246c0..64cb67a7b19 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -1319,9 +1319,12 @@ static bool r600_update_derived_state(struct r600_context *rctx) update_gs_block_state(rctx, rctx->gs_shader != NULL); - if (rctx->gs_shader) { + if (rctx->gs_shader) SELECT_SHADER_OR_FAIL(gs); + SELECT_SHADER_OR_FAIL(vs); + + if (rctx->gs_shader) { if (!rctx->shader_stages.geom_enable) { rctx->shader_stages.geom_enable = true; r600_mark_atom_dirty(rctx, &rctx->shader_stages.atom); @@ -1336,8 +1339,6 @@ static bool r600_update_derived_state(struct r600_context *rctx) rctx->b.streamout.enabled_stream_buffers_mask = rctx->gs_shader->current->gs_copy_shader->enabled_stream_buffers_mask; } - SELECT_SHADER_OR_FAIL(vs); - /* vs_shader is used as ES */ if (unlikely(vs_dirty || rctx->hw_shader_stages[R600_HW_STAGE_ES].shader != rctx->vs_shader->current)) { update_shader_atom(ctx, &rctx->hw_shader_stages[R600_HW_STAGE_ES], rctx->vs_shader->current); @@ -1350,8 +1351,6 @@ static bool r600_update_derived_state(struct r600_context *rctx) r600_mark_atom_dirty(rctx, &rctx->shader_stages.atom); } - SELECT_SHADER_OR_FAIL(vs); - if (unlikely(vs_dirty || rctx->hw_shader_stages[R600_HW_STAGE_VS].shader != rctx->vs_shader->current)) { update_shader_atom(ctx, &rctx->hw_shader_stages[R600_HW_STAGE_VS], rctx->vs_shader->current); |