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, 1 insertions, 16 deletions

diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp
index 228e23732..4b35b8a90 100644
--- a/mesalib/src/glsl/ir.cpp
+++ b/mesalib/src/glsl/ir.cpp
@@ -1095,21 +1095,6 @@ ir_dereference_record::ir_dereference_record(ir_variable *var,
       ? this->record->type->field_type(field) : glsl_type::error_type;

 }

 

-bool type_contains_sampler(const glsl_type *type)

-{

-   if (type->is_array()) {

-      return type_contains_sampler(type->fields.array);

-   } else if (type->is_record()) {

-      for (unsigned int i = 0; i < type->length; i++) {

-	 if (type_contains_sampler(type->fields.structure[i].type))

-	    return true;

-      }

-      return false;

-   } else {

-      return type->is_sampler();

-   }

-}

-

 bool

 ir_dereference::is_lvalue()

 {

@@ -1129,7 +1114,7 @@ ir_dereference::is_lvalue()
     *     as out or inout function parameters, nor can they be

     *     assigned into."

     */

-   if (type_contains_sampler(this->type))

+   if (this->type->contains_sampler())

       return false;

 

    return true;