Mesa (master): glsl: Always copy the index when cloning a variable.
Eric Anholt
anholt at kemper.freedesktop.org
Fri May 4 21:21:27 UTC 2012
Module: Mesa
Branch: master
Commit: 6508b0b9b0981662b9ae5bc559b4a6be524f7b86
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6508b0b9b0981662b9ae5bc559b4a6be524f7b86
Author: Eric Anholt <eric at anholt.net>
Date: Wed Apr 25 14:59:25 2012 -0700
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 <kenneth at whitecape.org>
Reviewed-by: Dave Airlie <airlied at redhat.com>
---
src/glsl/ir_clone.cpp | 7 +------
1 files changed, 1 insertions(+), 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);
More information about the mesa-commit
mailing list