Mesa (master): glsl: only call mark_max_array if we are assigning an

Timothy Arceri tarceri at kemper.freedesktop.org
Thu Jan 23 12:45:48 UTC 2014


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

Author: Timothy Arceri <t_arceri at yahoo.com.au>
Date:   Thu Jan 23 23:19:54 2014 +1100

glsl: only call mark_max_array if we are assigning an
 array

This change does not help fix or prevent any bugs
it just seems reasonable to do

Signed-off-by: Timothy Arceri <t_arceri at yahoo.com.au>
Reviewed-by: Paul Berry <stereotype441 at gmail.com>

---

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

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index e25cba3..be12f97 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -830,8 +830,10 @@ do_assignment(exec_list *instructions, struct _mesa_glsl_parse_state *state,
 						   rhs->type->array_size());
 	 d->type = var->type;
       }
-      mark_whole_array_access(rhs);
-      mark_whole_array_access(lhs);
+      if (lhs->type->is_array()) {
+         mark_whole_array_access(rhs);
+         mark_whole_array_access(lhs);
+      }
    }
 
    /* Most callers of do_assignment (assign, add_assign, pre_inc/dec,




More information about the mesa-commit mailing list