[Mesa-dev] [PATCH 21/30] r600g: setup const texture buffers for geom shaders

[Dave Airlie]

From: Dave Airlie <airl...@redhat.com>

This just enables the workarounds we have for vertex/pixel shaders
for geom shaders as well.

Signed-off-by: Dave Airlie <airl...@redhat.com>
---
 src/gallium/drivers/r600/r600_state_common.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gallium/drivers/r600/r600_state_common.c 
b/src/gallium/drivers/r600/r600_state_common.c
index 96fdd0e..0c32974 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)) {
-- 
1.8.3.1

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev