diff options
author | Paul Berry <stereotype441@gmail.com> | 2011-07-11 16:44:13 -0700 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2011-07-19 16:39:56 -0700 |
commit | ae11fb02dd267fa103093290b3fe51022eb16d57 (patch) | |
tree | c49b4bf8cfaa200038dcdc7ce832348327dce66d /src/glsl/glsl_types.h | |
parent | a90b88f3544e4d45793228fcd64561077593fe71 (diff) |
glsl: Move type_contains_sampler() into glsl_type for later reuse.
The new location, as a member function of glsl_type, is more
consistent with queries like is_sampler(), is_boolean(), is_float(),
etc. Placing the function inside glsl_type also makes it available to
any code that uses glsl_types.
(cherry picked from commit ddc1c96390b685bb95f7431e862c3a64fcefa085)
Diffstat (limited to 'src/glsl/glsl_types.h')
-rw-r--r-- | src/glsl/glsl_types.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h index 1b069df74fe..87f57e7c756 100644 --- a/src/glsl/glsl_types.h +++ b/src/glsl/glsl_types.h @@ -296,6 +296,12 @@ struct glsl_type { } /** + * Query whether or not type is a sampler, or for struct and array + * types, contains a sampler. + */ + bool contains_sampler() const; + + /** * Query whether or not a type is an array */ bool is_array() const |