Mesa (master): glsl: Move is_builtin flag back to ir_function_signature.
Kenneth Graunke
kwg at kemper.freedesktop.org
Wed Sep 8 00:46:15 UTC 2010
Module: Mesa
Branch: master
Commit: f412fac5b46eb274cbed8e62234d5dbfd859f1fe
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f412fac5b46eb274cbed8e62234d5dbfd859f1fe
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Sun Sep 5 01:48:11 2010 -0700
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.
---
src/glsl/ast_to_hir.cpp | 2 +-
src/glsl/ir.cpp | 14 +++++++++++++-
src/glsl/ir.h | 7 +++++--
src/glsl/ir_clone.cpp | 3 +--
src/glsl/ir_constant_expression.cpp | 2 +-
src/glsl/ir_import_prototypes.cpp | 2 +-
src/glsl/ir_print_visitor.cpp | 7 +++----
src/glsl/ir_reader.cpp | 2 +-
src/glsl/linker.cpp | 4 ++--
9 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 9e639ef..b8a01b8 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -2279,7 +2279,7 @@ ast_function::hir(exec_list *instructions,
* that the previously seen signature does not have an associated definition.
*/
f = state->symbols->get_function(name);
- if (f != NULL && !f->is_builtin) {
+ if (f != NULL && !f->has_builtin_signature()) {
sig = f->exact_matching_signature(&hir_parameters);
if (sig != NULL) {
const char *badvar = sig->qualifiers_match(&hir_parameters);
diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp
index 6d72725..9ac2485 100644
--- a/src/glsl/ir.cpp
+++ b/src/glsl/ir.cpp
@@ -1073,6 +1073,7 @@ ir_function_signature::ir_function_signature(const glsl_type *return_type)
: return_type(return_type), is_defined(false), _function(NULL)
{
this->ir_type = ir_type_function_signature;
+ this->is_builtin = false;
}
@@ -1124,7 +1125,18 @@ ir_function::ir_function(const char *name)
{
this->ir_type = ir_type_function;
this->name = talloc_strdup(this, name);
- this->is_builtin = false;
+}
+
+
+bool
+ir_function::has_builtin_signature()
+{
+ foreach_list(n, &this->signatures) {
+ ir_function_signature *const sig = (ir_function_signature *) n;
+ if (sig->is_builtin)
+ return true;
+ }
+ return false;
}
diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index efe59d8..0d93302 100644
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -342,6 +342,9 @@ public:
/** Whether or not this function has a body (which may be empty). */
unsigned is_defined:1;
+ /** Whether or not this function signature is a built-in. */
+ unsigned is_builtin:1;
+
/** Body of instructions in the function. */
struct exec_list body;
@@ -407,8 +410,8 @@ public:
*/
const char *name;
- /** Whether or not this function is a built-in. */
- unsigned is_builtin:1;
+ /** Whether or not this function has a signature that is a built-in. */
+ bool has_builtin_signature();
/**
* List of ir_function_signature for each overloaded function with this name.
diff --git a/src/glsl/ir_clone.cpp b/src/glsl/ir_clone.cpp
index 3b8beb5..aa84cf0 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.
*/
diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp
index 458dca7..ca12392 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;
diff --git a/src/glsl/ir_import_prototypes.cpp b/src/glsl/ir_import_prototypes.cpp
index a39b384..066137e 100644
--- a/src/glsl/ir_import_prototypes.cpp
+++ b/src/glsl/ir_import_prototypes.cpp
@@ -59,7 +59,6 @@ public:
this->function = this->symbols->get_function(ir->name);
if (!this->function) {
this->function = new(this->mem_ctx) ir_function(ir->name);
- this->function->is_builtin = ir->is_builtin;
list->push_tail(this->function);
@@ -87,6 +86,7 @@ public:
new(mem_ctx) ir_function_signature(ir->return_type);
copy->is_defined = false;
+ copy->is_builtin = ir->is_builtin;
/* Clone the parameter list, but NOT the body.
*/
diff --git a/src/glsl/ir_print_visitor.cpp b/src/glsl/ir_print_visitor.cpp
index 9d81cef..eff950e 100644
--- a/src/glsl/ir_print_visitor.cpp
+++ b/src/glsl/ir_print_visitor.cpp
@@ -153,15 +153,14 @@ void ir_print_visitor::visit(ir_function_signature *ir)
void ir_print_visitor::visit(ir_function *ir)
{
- /* Don't print built-in functions as part of the IR. */
- if (ir->is_builtin)
- return;
-
printf("(function %s\n", ir->name);
indentation++;
foreach_iter(exec_list_iterator, iter, *ir) {
ir_function_signature *const sig = (ir_function_signature *) iter.get();
+ if (sig->is_builtin)
+ continue;
+
indent();
sig->accept(this);
printf("\n");
diff --git a/src/glsl/ir_reader.cpp b/src/glsl/ir_reader.cpp
index 04b9829..a9cbf8e 100644
--- a/src/glsl/ir_reader.cpp
+++ b/src/glsl/ir_reader.cpp
@@ -218,7 +218,6 @@ read_function(_mesa_glsl_parse_state *st, s_list *list, bool skip_body)
ir_function *f = st->symbols->get_function(name->value());
if (f == NULL) {
f = new(ctx) ir_function(name->value());
- f->is_builtin = true;
added = st->symbols->add_function(f->name, f);
assert(added);
}
@@ -291,6 +290,7 @@ read_function_sig(_mesa_glsl_parse_state *st, ir_function *f, s_list *list,
if (sig == NULL && skip_body) {
/* If scanning for prototypes, generate a new signature. */
sig = new(ctx) ir_function_signature(return_type);
+ sig->is_builtin = true;
f->add_signature(sig);
} else if (sig != NULL) {
const char *badvar = sig->qualifiers_match(&hir_parameters);
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 4d84ab3..78f3a74 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -740,14 +740,14 @@ link_intrastage_shaders(GLcontext *ctx,
ir_function_signature *sig =
(ir_function_signature *) iter.get();
- if (!sig->is_defined || f->is_builtin)
+ if (!sig->is_defined || sig->is_builtin)
continue;
ir_function_signature *other_sig =
other->exact_matching_signature(& sig->parameters);
if ((other_sig != NULL) && other_sig->is_defined
- && !other_sig->function()->is_builtin) {
+ && !other_sig->is_builtin) {
linker_error_printf(prog,
"function `%s' is multiply defined",
f->name);
More information about the mesa-commit
mailing list