On Thu, Apr 26, 2012 at 12:07 AM, Eric Anholt <[email protected]> wrote: > The index is also used for GL_ARB_blend_func_extended. Cloning in > i965 was dropping a non-ARB_explicit_attrib_location index.
LGTM Reviewed-by: Dave Airlie <[email protected]> Dave. > --- > src/glsl/ir_clone.cpp | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/src/glsl/ir_clone.cpp b/src/glsl/ir_clone.cpp > index 5a7a71c..5046ac3 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); > > -- > 1.7.10 > > _______________________________________________ > mesa-dev mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
