diff options
| author | Kenneth Graunke <[email protected]> | 2010-09-16 02:52:25 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2010-09-16 02:52:25 -0700 |
| commit | 81f03393982c29f8f4165b5629c8e8fb708b97a3 (patch) | |
| tree | d5bf9ed544b58198841249f4cecbaad33dfee700 /src/glsl | |
| parent | df62338c491f2cace1a48f99de78e83b5edd82fd (diff) | |
glsl: Change from has_builtin_signature to has_user_signature.
The print visitor needs this, and the only existing user can work with
has_user_signature just as well.
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/ast_to_hir.cpp | 2 | ||||
| -rw-r--r-- | src/glsl/ir.cpp | 4 | ||||
| -rw-r--r-- | src/glsl/ir.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 31bb40dd138..96385449bd6 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl/ast_to_hir.cpp @@ -2285,7 +2285,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 && (state->es_shader || !f->has_builtin_signature())) { + if (f != NULL && (state->es_shader || f->has_user_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 86dc4901543..7cc55d40b78 100644 --- a/src/glsl/ir.cpp +++ b/src/glsl/ir.cpp @@ -1137,11 +1137,11 @@ ir_function::ir_function(const char *name) bool -ir_function::has_builtin_signature() +ir_function::has_user_signature() { foreach_list(n, &this->signatures) { ir_function_signature *const sig = (ir_function_signature *) n; - if (sig->is_builtin) + if (!sig->is_builtin) return true; } return false; diff --git a/src/glsl/ir.h b/src/glsl/ir.h index 70c6faaf156..b3b15bb08ed 100644 --- a/src/glsl/ir.h +++ b/src/glsl/ir.h @@ -410,8 +410,8 @@ public: */ const char *name; - /** Whether or not this function has a signature that is a built-in. */ - bool has_builtin_signature(); + /** Whether or not this function has a signature that isn't a built-in. */ + bool has_user_signature(); /** * List of ir_function_signature for each overloaded function with this name. |