diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2010-09-05 01:48:11 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2010-09-07 17:30:38 -0700 |
| commit | f412fac5b46eb274cbed8e62234d5dbfd859f1fe (patch) | |
| tree | 89bbe21c6ba90bdfc59e850ebda738e329fc1fff /src/glsl/ir_clone.cpp | |
| parent | c98deb18d5836f75cf62562f9304e4d90e0ea920 (diff) | |
glsl: Move is_builtin flag back to ir_function_signature.
This effectively reverts b6f15869b324ae64a00d0fe46fa3c8c62c1edb6c.
In desktop GLSL, defining a function with the same name as a built-in
hides that built-in function completely, so there would never be
built-in and user function signatures in the same ir_function.
However, in GLSL ES, overloading built-ins is allowed, and does not
hide the built-in signatures - so we're back to needing this.
Diffstat (limited to 'src/glsl/ir_clone.cpp')
| -rw-r--r-- | src/glsl/ir_clone.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/glsl/ir_clone.cpp b/src/glsl/ir_clone.cpp index 3b8beb54b5..aa84cf0572 100644 --- a/src/glsl/ir_clone.cpp +++ b/src/glsl/ir_clone.cpp @@ -250,8 +250,6 @@ ir_function::clone(void *mem_ctx, struct hash_table *ht) const { ir_function *copy = new(mem_ctx) ir_function(this->name); - copy->is_builtin = this->is_builtin; - foreach_list_const(node, &this->signatures) { const ir_function_signature *const sig = (const ir_function_signature *const) node; @@ -274,6 +272,7 @@ ir_function_signature::clone(void *mem_ctx, struct hash_table *ht) const new(mem_ctx) ir_function_signature(this->return_type); copy->is_defined = this->is_defined; + copy->is_builtin = this->is_builtin; /* Clone the parameter list. */ |