Mesa (master): glsl: fix component size calculation for tessellation and geom shaders

Timothy Arceri tarceri at kemper.freedesktop.org
Mon Sep 28 01:31:57 UTC 2015


Module: Mesa
Branch: master
Commit: e413d2fbc4b37eb552ee42940fb792e504233e51
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e413d2fbc4b37eb552ee42940fb792e504233e51

Author: Timothy Arceri <t_arceri at yahoo.com.au>
Date:   Mon Sep 28 11:03:19 2015 +1000

glsl: fix component size calculation for tessellation and geom shaders

Broken in commit abdab88b30ab when adding arrays of arrays support

Reviewed-by: Dave Airlie <airlied at redhat.com>

---

 src/glsl/link_varyings.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/glsl/link_varyings.cpp b/src/glsl/link_varyings.cpp
index 0d343d6..7e77a67 100644
--- a/src/glsl/link_varyings.cpp
+++ b/src/glsl/link_varyings.cpp
@@ -964,7 +964,7 @@ varying_matches::record(ir_variable *producer_var, ir_variable *consumer_var)
          }
          slots *= type->matrix_columns;
       } else {
-         slots = var->type->matrix_columns;
+         slots = type->matrix_columns;
       }
       this->matches[this->num_matches].num_components = 4 * slots;
    } else {




More information about the mesa-commit mailing list