diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-02-09 13:56:23 -0800 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-02-13 17:22:36 -0800 |
| commit | ac089126b9b647f930ee2657aa16ea8e8f6a5dd7 (patch) | |
| tree | 23aef91d7692c492db3c06de36a0d5c70d232baf /src/compiler/glsl/builtin_functions.cpp | |
| parent | 4ed4c1d9210b11ce6faea81455c21531904ea45b (diff) | |
| download | external_mesa3d-ac089126b9b647f930ee2657aa16ea8e8f6a5dd7.zip external_mesa3d-ac089126b9b647f930ee2657aa16ea8e8f6a5dd7.tar.gz external_mesa3d-ac089126b9b647f930ee2657aa16ea8e8f6a5dd7.tar.bz2 | |
glsl/types: Rename sampler_type to sampled_type
It's a bit more descriptive since it is the base type that you get when you
sample from it. Also, the next commit adds a bare "sampler" type and we
need glsl_type::sampler_type available for a public static member.
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Diffstat (limited to 'src/compiler/glsl/builtin_functions.cpp')
| -rw-r--r-- | src/compiler/glsl/builtin_functions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/glsl/builtin_functions.cpp b/src/compiler/glsl/builtin_functions.cpp index 5512a33..f488434 100644 --- a/src/compiler/glsl/builtin_functions.cpp +++ b/src/compiler/glsl/builtin_functions.cpp @@ -2921,7 +2921,7 @@ builtin_builder::add_image_function(const char *name, ir_function *f = new(mem_ctx) ir_function(name); for (unsigned i = 0; i < ARRAY_SIZE(types); ++i) { - if ((types[i]->sampler_type != GLSL_TYPE_FLOAT || + if ((types[i]->sampled_type != GLSL_TYPE_FLOAT || (flags & IMAGE_FUNCTION_SUPPORTS_FLOAT_DATA_TYPE)) && (types[i]->sampler_dimensionality == GLSL_SAMPLER_DIM_MS || !(flags & IMAGE_FUNCTION_MS_ONLY))) @@ -5238,7 +5238,7 @@ builtin_builder::_image_prototype(const glsl_type *image_type, unsigned flags) { const glsl_type *data_type = glsl_type::get_instance( - image_type->sampler_type, + image_type->sampled_type, (flags & IMAGE_FUNCTION_HAS_VECTOR_DATA_TYPE ? 4 : 1), 1); const glsl_type *ret_type = (flags & IMAGE_FUNCTION_RETURNS_VOID ? |