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

diff --git a/mesalib/src/mesa/program/prog_statevars.c b/mesalib/src/mesa/program/prog_statevars.c
index ddda78e19..c68e1643a 100644
--- a/mesalib/src/mesa/program/prog_statevars.c
+++ b/mesalib/src/mesa/program/prog_statevars.c
@@ -1111,7 +1111,7 @@ _mesa_load_state_parameters(struct gl_context *ctx,
       if (paramList->Parameters[i].Type == PROGRAM_STATE_VAR) {

          _mesa_fetch_state(ctx,

 			   paramList->Parameters[i].StateIndexes,

-                           paramList->ParameterValues[i]);

+                           &paramList->ParameterValues[i][0].f);

       }

    }

 }