From 60850b7b9fbb9827d6841dbd4a4cd9b1e3554d45 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 9 Sep 2013 14:53:22 -0700 Subject: [PATCH] glsl: Rename ir_function_signature::builtin_info to builtin_avail. builtin_info was originally going to be a structure containing a bunch of information, but after various rewrites, it turned into a boolean availability predicate. builtin_avail is a better name than builtin_info, since it doesn't store any information other than availability. Signed-off-by: Kenneth Graunke Reviewed-by: Paul Berry --- src/glsl/ir.cpp | 8 ++++---- src/glsl/ir.h | 4 ++-- src/glsl/ir_clone.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp index 67251c1b397..99f6b60b887 100644 --- a/src/glsl/ir.cpp +++ b/src/glsl/ir.cpp @@ -1617,7 +1617,7 @@ ir_variable::determine_interpolation_mode(bool flat_shade) ir_function_signature::ir_function_signature(const glsl_type *return_type, builtin_available_predicate b) - : return_type(return_type), is_defined(false), builtin_info(b), + : return_type(return_type), is_defined(false), builtin_avail(b), _function(NULL) { this->ir_type = ir_type_function_signature; @@ -1628,7 +1628,7 @@ ir_function_signature::ir_function_signature(const glsl_type *return_type, bool ir_function_signature::is_builtin() const { - return builtin_info != NULL; + return builtin_avail != NULL; } @@ -1644,8 +1644,8 @@ ir_function_signature::is_builtin_available(const _mesa_glsl_parse_state *state) if (state == NULL) return true; - assert(builtin_info != NULL); - return builtin_info(state); + assert(builtin_avail != NULL); + return builtin_avail(state); } diff --git a/src/glsl/ir.h b/src/glsl/ir.h index bfbb94c5b15..691732b5627 100644 --- a/src/glsl/ir.h +++ b/src/glsl/ir.h @@ -608,7 +608,7 @@ class ir_function_signature : public ir_instruction { */ public: ir_function_signature(const glsl_type *return_type, - builtin_available_predicate builtin_info = NULL); + builtin_available_predicate builtin_avail = NULL); virtual ir_function_signature *clone(void *mem_ctx, struct hash_table *ht) const; @@ -697,7 +697,7 @@ private: * A function pointer to a predicate that answers whether a built-in * function is available in the current shader. NULL if not a built-in. */ - builtin_available_predicate builtin_info; + builtin_available_predicate builtin_avail; /** Function of which this signature is one overload. */ class ir_function *_function; diff --git a/src/glsl/ir_clone.cpp b/src/glsl/ir_clone.cpp index a91afb7ac84..fb303b0b75c 100644 --- a/src/glsl/ir_clone.cpp +++ b/src/glsl/ir_clone.cpp @@ -329,7 +329,7 @@ ir_function_signature::clone_prototype(void *mem_ctx, struct hash_table *ht) con new(mem_ctx) ir_function_signature(this->return_type); copy->is_defined = false; - copy->builtin_info = this->builtin_info; + copy->builtin_avail = this->builtin_avail; copy->origin = this; /* Clone the parameter list, but NOT the body. -- 2.30.2