diff options
author | Eric Anholt <eric@anholt.net> | 2010-12-01 15:55:53 -0800 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2010-12-01 16:14:34 -0800 |
commit | b4f585665c31b1f80d909e38b3b2a9fab0c03076 (patch) | |
tree | 958cd5409c25ad5fa7f4c9dee22a4027ebc055ac /src | |
parent | f361f8a8a9a71d84fc569445902adacc2f2cc069 (diff) |
glsl: Mark the array access for whole-array comparisons.
By not doing so, the uniform contents of
glsl-uniform-non-uniform-array-compare.shader_test was getting thrown
out since nobody was recorded as dereferencing the array.
Diffstat (limited to 'src')
-rw-r--r-- | src/glsl/ast_to_hir.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 04b221e9b8..f5b1120f78 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl/ast_to_hir.cpp @@ -745,6 +745,16 @@ ast_node::hir(exec_list *instructions, return NULL; } +static void +mark_whole_array_access(ir_rvalue *access) +{ + ir_dereference_variable *deref = access->as_dereference_variable(); + + if (deref) { + deref->var->max_array_access = deref->type->length - 1; + } +} + static ir_rvalue * do_comparison(void *mem_ctx, int operation, ir_rvalue *op0, ir_rvalue *op1) { @@ -780,6 +790,10 @@ do_comparison(void *mem_ctx, int operation, ir_rvalue *op0, ir_rvalue *op1) last = result; } } + + mark_whole_array_access(op0); + mark_whole_array_access(op1); + return last; } |