Mesa (master): glsl/ast: Don't perform GS input array checks on non-inputs.

[Paul Berry]

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

Author: Paul Berry <stereotype...@gmail.com>
Date:   Mon Aug 12 06:39:23 2013 -0700

glsl/ast: Don't perform GS input array checks on non-inputs.

Previously, we were accidentally calling
handle_geometry_shader_input_decl() on non-input interface block
declarations, resulting in bogus error checking.

Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>

---

 src/glsl/ast_to_hir.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 8e1e6e5..1bfa887 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -4600,7 +4600,7 @@ ast_interface_block::hir(exec_list *instructions,
       }
 
       var->interface_type = block_type;
-      if (state->target == geometry_shader)
+      if (state->target == geometry_shader && var_mode == ir_var_shader_in)
          handle_geometry_shader_input_decl(state, loc, var);
       state->symbols->add_variable(var);
       instructions->push_tail(var);

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