From 598c2e2c83447cf222f96f833569eeb0bd179871 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Fri, 6 Jun 2014 13:28:32 +0200 Subject: [PATCH] glsl: Only geometry shader outputs can be associated with non-zero streams. This should be ensured by the parser, so assert on that. Reviewed-by: Chris Forbes Reviewed-by: Ian Romanick --- src/glsl/link_varyings.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/glsl/link_varyings.cpp b/src/glsl/link_varyings.cpp index 3d5a6807cdd..520a51a278e 100644 --- a/src/glsl/link_varyings.cpp +++ b/src/glsl/link_varyings.cpp @@ -1347,6 +1347,11 @@ assign_varying_locations(struct gl_context *ctx, (output_var->data.mode != ir_var_shader_out)) continue; + /* Only geometry shaders can use non-zero streams */ + assert(output_var->data.stream == 0 || + (output_var->data.stream < MAX_VERTEX_STREAMS && + producer->Stage == MESA_SHADER_GEOMETRY)); + tfeedback_candidate_generator g(mem_ctx, tfeedback_candidates); g.process(output_var); -- 2.30.2