From 6508b0b9b0981662b9ae5bc559b4a6be524f7b86 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 25 Apr 2012 14:59:25 -0700 Subject: glsl: Always copy the index when cloning a variable. The index is also used for GL_ARB_blend_func_extended. Cloning in i965 was dropping a non-ARB_explicit_attrib_location index. Reviewed-by: Kenneth Graunke Reviewed-by: Dave Airlie --- src/glsl/ir_clone.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/glsl') diff --git a/src/glsl/ir_clone.cpp b/src/glsl/ir_clone.cpp index 5a7a71cf6ba..5046ac372a1 100644 --- a/src/glsl/ir_clone.cpp +++ b/src/glsl/ir_clone.cpp @@ -53,6 +53,7 @@ ir_variable::clone(void *mem_ctx, struct hash_table *ht) const var->invariant = this->invariant; var->interpolation = this->interpolation; var->location = this->location; + var->index = this->index; var->warn_extension = this->warn_extension; var->origin_upper_left = this->origin_upper_left; var->pixel_center_integer = this->pixel_center_integer; @@ -72,12 +73,6 @@ ir_variable::clone(void *mem_ctx, struct hash_table *ht) const sizeof(this->state_slots[0]) * var->num_state_slots); } - if (this->explicit_location) - var->location = this->location; - - if (this->explicit_index) - var->index = this->index; - if (this->constant_value) var->constant_value = this->constant_value->clone(mem_ctx, ht); -- cgit v1.2.3