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/tests | |
| 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/tests')
| -rw-r--r-- | src/compiler/glsl/tests/sampler_types_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/glsl/tests/sampler_types_test.cpp b/src/compiler/glsl/tests/sampler_types_test.cpp index 04dd65e..ef03158 100644 --- a/src/compiler/glsl/tests/sampler_types_test.cpp +++ b/src/compiler/glsl/tests/sampler_types_test.cpp @@ -43,7 +43,7 @@ TEST(sampler_types, TYPE) \ const glsl_type *type = glsl_type::TYPE##_type; \ EXPECT_EQ(GLSL_TYPE_SAMPLER, type->base_type); \ EXPECT_EQ(DIM, type->sampler_dimensionality); \ - EXPECT_EQ(DATA_TYPE, type->sampler_type); \ + EXPECT_EQ(DATA_TYPE, type->sampled_type); \ ARR; \ SHAD; \ EXPECT_EQ(COMPS, type->coordinate_components()); \ |