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 <kenneth@whitecape.org>
Reviewed-by: Paul Berry <stereotype441@gmail.com>

diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp
index 67251c1b39758d0dba1577f4f626d8d941a1393b..99f6b60b887c84fad38023933b54453729768202 100644 (file)
--- 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 bfbb94c5b157a9be1f0406f89c9acf4d4cda785d..691732b56279bf68bded1f41eb7c0278f6f435fb 100644 (file)
--- 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 a91afb7ac84c3d23cbeb91f4b5b57c40e9cacfaa..fb303b0b75c9874874bc192762331f3b06820ded 100644 (file)
--- 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.