r600: bind geometry shader ring to the correct place

When tess/gs are enabled, the geom shader ring needs
to bind to the tess eval not the vertex shader.

Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
index bf2f10986e83160f5306921ac89f2743ddf8d474..1a18e695fa807f0f4ba36514bba2b79d9ccea840 100644 (file)
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -1354,13 +1354,20 @@ static void update_gs_block_state(struct r600_context *rctx, unsigned enable)
                if (enable) {
                        r600_set_constant_buffer(&rctx->b.b, PIPE_SHADER_GEOMETRY,
                                        R600_GS_RING_CONST_BUFFER, &rctx->gs_rings.esgs_ring);
-                       r600_set_constant_buffer(&rctx->b.b, PIPE_SHADER_VERTEX,
-                                       R600_GS_RING_CONST_BUFFER, &rctx->gs_rings.gsvs_ring);
+                       if (rctx->tes_shader) {
+                               r600_set_constant_buffer(&rctx->b.b, PIPE_SHADER_TESS_EVAL,
+                                                        R600_GS_RING_CONST_BUFFER, &rctx->gs_rings.gsvs_ring);
+                       } else {
+                               r600_set_constant_buffer(&rctx->b.b, PIPE_SHADER_VERTEX,
+                                                        R600_GS_RING_CONST_BUFFER, &rctx->gs_rings.gsvs_ring);
+                       }
                } else {
                        r600_set_constant_buffer(&rctx->b.b, PIPE_SHADER_GEOMETRY,
                                        R600_GS_RING_CONST_BUFFER, NULL);
                        r600_set_constant_buffer(&rctx->b.b, PIPE_SHADER_VERTEX,
                                        R600_GS_RING_CONST_BUFFER, NULL);
+                       r600_set_constant_buffer(&rctx->b.b, PIPE_SHADER_TESS_EVAL,
+                                       R600_GS_RING_CONST_BUFFER, NULL);
                }
        }
 }