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/ir.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/ir.cpp')
| -rw-r--r-- | src/compiler/glsl/ir.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/glsl/ir.cpp b/src/compiler/glsl/ir.cpp index 5debca3..c7a2496 100644 --- a/src/compiler/glsl/ir.cpp +++ b/src/compiler/glsl/ir.cpp @@ -1442,7 +1442,7 @@ ir_texture::set_sampler(ir_dereference *sampler, const glsl_type *type) assert(sampler->type->base_type == GLSL_TYPE_SAMPLER); assert(sampler->type->sampler_dimensionality == GLSL_SAMPLER_DIM_MS); } else { - assert(sampler->type->sampler_type == (int) type->base_type); + assert(sampler->type->sampled_type == (int) type->base_type); if (sampler->type->sampler_shadow) assert(type->vector_elements == 4 || type->vector_elements == 1); else |