diff options
| -rw-r--r-- | src/glsl/builtin_functions.cpp | 2 | ||||
| -rw-r--r-- | src/glsl/glsl_types.cpp | 19 | ||||
| -rw-r--r-- | src/glsl/glsl_types.h | 19 | ||||
| -rw-r--r-- | src/glsl/tests/sampler_types_test.cpp | 2 |
4 files changed, 35 insertions, 7 deletions
diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp index 2162baa27e5..4ff22125350 100644 --- a/src/glsl/builtin_functions.cpp +++ b/src/glsl/builtin_functions.cpp @@ -3549,7 +3549,7 @@ builtin_builder::_texture(ir_texture_opcode opcode, ir_texture *tex = new(mem_ctx) ir_texture(opcode); tex->set_sampler(var_ref(s), return_type); - const int coord_size = sampler_type->sampler_coordinate_components(); + const int coord_size = sampler_type->coordinate_components(); if (coord_size == coord_type->vector_elements) { tex->coordinate = var_ref(P); diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp index 48b3eb53886..849a79af45c 100644 --- a/src/glsl/glsl_types.cpp +++ b/src/glsl/glsl_types.cpp @@ -226,6 +226,21 @@ glsl_type::sampler_index() const } } +bool +glsl_type::contains_image() const +{ + if (this->is_array()) { + return this->fields.array->contains_image(); + } else if (this->is_record()) { + for (unsigned int i = 0; i < this->length; i++) { + if (this->fields.structure[i].type->contains_image()) + return true; + } + return false; + } else { + return this->is_image(); + } +} const glsl_type *glsl_type::get_base_type() const { @@ -955,10 +970,8 @@ glsl_type::count_attribute_slots() const } int -glsl_type::sampler_coordinate_components() const +glsl_type::coordinate_components() const { - assert(is_sampler()); - int size; switch (sampler_dimensionality) { diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h index 6b38e0999cc..ae3829f30e0 100644 --- a/src/glsl/glsl_types.h +++ b/src/glsl/glsl_types.h @@ -404,6 +404,20 @@ struct glsl_type { gl_texture_index sampler_index() const; /** + * Query whether or not type is an image, or for struct and array + * types, contains an image. + */ + bool contains_image() const; + + /** + * Query whether or not a type is an image + */ + bool is_image() const + { + return base_type == GLSL_TYPE_IMAGE; + } + + /** * Query whether or not a type is an array */ bool is_array() const @@ -533,7 +547,8 @@ struct glsl_type { } /** - * Return the number of coordinate components needed for this sampler type. + * Return the number of coordinate components needed for this + * sampler or image type. * * This is based purely on the sampler's dimensionality. For example, this * returns 1 for sampler1D, and 3 for sampler2DArray. @@ -542,7 +557,7 @@ struct glsl_type { * a texturing built-in function, since those pack additional values (such * as the shadow comparitor or projector) into the coordinate type. */ - int sampler_coordinate_components() const; + int coordinate_components() const; /** * Compare a record type against another record type. diff --git a/src/glsl/tests/sampler_types_test.cpp b/src/glsl/tests/sampler_types_test.cpp index 4fb30dd53ad..86d329a8301 100644 --- a/src/glsl/tests/sampler_types_test.cpp +++ b/src/glsl/tests/sampler_types_test.cpp @@ -47,7 +47,7 @@ TEST(sampler_types, TYPE) \ EXPECT_EQ(DATA_TYPE, type->sampler_type); \ ARR; \ SHAD; \ - EXPECT_EQ(COMPS, type->sampler_coordinate_components()); \ + EXPECT_EQ(COMPS, type->coordinate_components()); \ } T( sampler1D, GLSL_SAMPLER_DIM_1D, GLSL_TYPE_FLOAT, NONARRAY, COLOR, 1) |