[Mesa-dev] [RFC PATCH 39/56] glsl: Fix linking of VS outputs to TCS inputs

Chris Forbes chrisf at ijw.co.nz
Sat Sep 20 18:41:19 PDT 2014


In the TCS, these are all arrays, just like GS inputs.
---
 src/glsl/link_varyings.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/glsl/link_varyings.cpp b/src/glsl/link_varyings.cpp
index 53c26d2..5d232482 100644
--- a/src/glsl/link_varyings.cpp
+++ b/src/glsl/link_varyings.cpp
@@ -54,7 +54,8 @@ cross_validate_types_and_qualifiers(struct gl_shader_program *prog,
    /* Check that the types match between stages.
     */
    const glsl_type *type_to_match = input->type;
-   if (consumer_stage == MESA_SHADER_GEOMETRY) {
+   if (consumer_stage == MESA_SHADER_GEOMETRY ||
+       consumer_stage == MESA_SHADER_TESS_CTRL) {
       assert(type_to_match->is_array()); /* Enforced by ast_to_hir */
       type_to_match = type_to_match->element_type();
    }
-- 
2.1.0



More information about the mesa-dev mailing list