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_constant_expression.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_constant_expression.cpp')
| -rw-r--r-- | src/glsl/ir_constant_expression.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp index 458dca7977..ca12392a74 100644 --- a/src/glsl/ir_constant_expression.cpp +++ b/src/glsl/ir_constant_expression.cpp @@ -785,7 +785,7 @@ ir_call::constant_expression_value() * "Function calls to user-defined functions (non-built-in functions) * cannot be used to form constant expressions." */ - if (!this->callee->function()->is_builtin) + if (!this->callee->is_builtin) return NULL; unsigned num_parameters = 0; |