Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glsl_types.cpp
	mesalib/src/glsl/ir.cpp
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/linker.cpp
	mesalib/src/glsl/s_expression.cpp
	mesalib/src/mesa/drivers/common/driverfuncs.c
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c

1 files changed, 16 insertions, 0 deletions

diff --git a/mesalib/src/glsl/glsl_types.cpp b/mesalib/src/glsl/glsl_types.cpp
index ba862dfd6..978e9a398 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)

 {