From 91e91b72f07f4e61db17ee86c6933a7217f0e25c Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 22 Jul 2011 08:22:17 +0200 Subject: mesa git update 22 July 2011 --- mesalib/src/glsl/glsl_types.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'mesalib/src/glsl/glsl_types.cpp') diff --git a/mesalib/src/glsl/glsl_types.cpp b/mesalib/src/glsl/glsl_types.cpp index 78d10bd93..a5e21bbb9 100644 --- a/mesalib/src/glsl/glsl_types.cpp +++ b/mesalib/src/glsl/glsl_types.cpp @@ -111,6 +111,22 @@ add_types_to_symbol_table(glsl_symbol_table *symtab, } } +bool +glsl_type::contains_sampler() const +{ + if (this->is_array()) { + return this->fields.array->contains_sampler(); + } else if (this->is_record()) { + for (unsigned int i = 0; i < this->length; i++) { + if (this->fields.structure[i].type->contains_sampler()) + return true; + } + return false; + } else { + return this->is_sampler(); + } +} + void glsl_type::generate_100ES_types(glsl_symbol_table *symtab) { -- cgit v1.2.3