Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/mesa/SConscript
	mesalib/src/mesa/main/compiler.h
	mesalib/src/mesa/main/enable.c
	mesalib/src/mesa/main/ff_fragment_shader.cpp
	mesalib/src/mesa/main/texcompress_rgtc_tmp.h
	mesalib/src/mesa/main/texobj.c
	mesalib/src/mesa/main/texparam.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/program/prog_print.c
	mesalib/src/mesa/program/prog_statevars.c
	mesalib/src/mesa/program/program.c
	mesalib/src/mesa/program/program_parse.y
	mesalib/src/mesa/program/program_parser.h
	mesalib/src/mesa/program/sampler.cpp
	mesalib/src/mesa/sources.mak
	mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
	mesalib/src/mesa/state_tracker/st_cb_blit.c
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_extensions.c
	mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
	mesalib/src/mesa/state_tracker/st_program.c
	mesalib/src/mesa/state_tracker/st_texture.h
	mesalib/src/mesa/vbo/vbo_exec_array.c
	pixman/pixman/pixman-arm-neon-asm.S
	pixman/pixman/pixman-arm-neon.c

1 files changed, 4 insertions, 4 deletions

diff --git a/mesalib/src/mesa/program/ir_to_mesa.cpp b/mesalib/src/mesa/program/ir_to_mesa.cpp
index a08aa0af8..326d1fb63 100644
--- a/mesalib/src/mesa/program/ir_to_mesa.cpp
+++ b/mesalib/src/mesa/program/ir_to_mesa.cpp
@@ -585,7 +585,7 @@ ir_to_mesa_visitor::src_reg_for_float(float val)
    src_reg src(PROGRAM_CONSTANT, -1, NULL);

 

    src.index = _mesa_add_unnamed_constant(this->prog->Parameters,

-					  &val, 1, &src.swizzle);

+					  (const gl_constant_value *)&val, 1, &src.swizzle);

 

    return src;

 }

@@ -1795,7 +1795,7 @@ ir_to_mesa_visitor::visit(ir_constant *ir)
 

 	 src = src_reg(PROGRAM_CONSTANT, -1, NULL);

 	 src.index = _mesa_add_unnamed_constant(this->prog->Parameters,

-						values,

+						(gl_constant_value *) values,

 						ir->type->vector_elements,

 						&src.swizzle);

 	 emit(ir, OPCODE_MOV, mat_column, src);

@@ -1833,7 +1833,7 @@ ir_to_mesa_visitor::visit(ir_constant *ir)
 

    this->result = src_reg(PROGRAM_CONSTANT, -1, ir->type);

    this->result.index = _mesa_add_unnamed_constant(this->prog->Parameters,

-						   values,

+						   (gl_constant_value *) values,

 						   ir->type->vector_elements,

 						   &this->result.swizzle);

 }

@@ -2533,7 +2533,7 @@ add_uniforms_to_parameters_list(struct gl_shader_program *shader_program,
 	  */

 	 if (file == PROGRAM_SAMPLER) {

 	    for (unsigned int j = 0; j < size / 4; j++)

-	       prog->Parameters->ParameterValues[index + j][0] = next_sampler++;

+	       prog->Parameters->ParameterValues[index + j][0].f = next_sampler++;

 	 }

 

 	 /* The location chosen in the Parameters list here (returned