diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-01-28 12:06:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-02-05 10:49:41 +1000 |
| commit | 5191937352f50e214073b1fcdf6018df2ea431a6 (patch) | |
| tree | ed3714498803803dd473422b847dd4bd2154dd7c /src/gallium/drivers/r600/r600_state_common.c | |
| parent | afce47fb0b489c248ebeb3660c30660ae900b967 (diff) | |
r600g: setup const texture buffers for geom shaders
This just enables the workarounds we have for vertex/pixel shaders
for geom shaders as well.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src/gallium/drivers/r600/r600_state_common.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_state_common.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index 96fdd0e00ad..0c32974430f 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -1252,11 +1252,15 @@ static bool r600_update_derived_state(struct r600_context *rctx) r600_setup_buffer_constants(rctx, PIPE_SHADER_FRAGMENT); if (rctx->vs_shader && rctx->vs_shader->current->shader.uses_tex_buffers) r600_setup_buffer_constants(rctx, PIPE_SHADER_VERTEX); + if (rctx->gs_shader && rctx->gs_shader->current->shader.uses_tex_buffers) + r600_setup_buffer_constants(rctx, PIPE_SHADER_GEOMETRY); } else { if (rctx->ps_shader && rctx->ps_shader->current->shader.uses_tex_buffers) eg_setup_buffer_constants(rctx, PIPE_SHADER_FRAGMENT); if (rctx->vs_shader && rctx->vs_shader->current->shader.uses_tex_buffers) eg_setup_buffer_constants(rctx, PIPE_SHADER_VERTEX); + if (rctx->gs_shader && rctx->gs_shader->current->shader.uses_tex_buffers) + eg_setup_buffer_constants(rctx, PIPE_SHADER_GEOMETRY); } @@ -1264,6 +1268,8 @@ static bool r600_update_derived_state(struct r600_context *rctx) r600_setup_txq_cube_array_constants(rctx, PIPE_SHADER_FRAGMENT); if (rctx->vs_shader && rctx->vs_shader->current->shader.has_txq_cube_array_z_comp) r600_setup_txq_cube_array_constants(rctx, PIPE_SHADER_VERTEX); + if (rctx->gs_shader && rctx->gs_shader->current->shader.has_txq_cube_array_z_comp) + r600_setup_txq_cube_array_constants(rctx, PIPE_SHADER_GEOMETRY); if (rctx->b.chip_class < EVERGREEN && rctx->ps_shader && rctx->vs_shader) { if (!r600_adjust_gprs(rctx)) { |