fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

r600: use a macro to remove common shader selection code.

Browse source 
This function is going to get a lot messier with tessellation
so I'm going to use some macros to try and clean some bits
of common code up.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2015-11-30 11:12:07 +10:00
parent 19799a5928
commit 3a7232a9a9
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/gallium/drivers/r600/r600_state_common.c
View file

@ -1288,6 +1288,11 @@ static void r600_update_clip_state(struct r600_context *rctx,
r600_mark_atom_dirty(rctx, &rctx->clip_misc_state.atom);
}
}
#define SELECT_SHADER_OR_FAIL(x) do { \
r600_shader_select(ctx, rctx->x##_shader, &x##_dirty); \
if (unlikely(!rctx->x##_shader->current)) \
return false; \
} while(0)
static bool r600_update_derived_state(struct r600_context *rctx)
{
@ -1310,16 +1315,12 @@ static bool r600_update_derived_state(struct r600_context *rctx)
}
}
r600_shader_select(ctx, rctx->ps_shader, &ps_dirty);
if (unlikely(!rctx->ps_shader->current))
return false;
SELECT_SHADER_OR_FAIL(ps);
update_gs_block_state(rctx, rctx->gs_shader != NULL);
if (rctx->gs_shader) {
r600_shader_select(ctx, rctx->gs_shader, &gs_dirty);
if (unlikely(!rctx->gs_shader->current))
return false;
SELECT_SHADER_OR_FAIL(gs);
if (!rctx->shader_stages.geom_enable) {
rctx->shader_stages.geom_enable = true;
@ -1335,9 +1336,7 @@ 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;
}
r600_shader_select(ctx, rctx->vs_shader, &vs_dirty);
if (unlikely(!rctx->vs_shader->current))
return false;
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)) {
@ -1351,9 +1350,7 @@ static bool r600_update_derived_state(struct r600_context *rctx)
r600_mark_atom_dirty(rctx, &rctx->shader_stages.atom);
}
r600_shader_select(ctx, rctx->vs_shader, &vs_dirty);
if (unlikely(!rctx->vs_shader->current))
return false;
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);