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, 5 insertions, 3 deletions

diff --git a/mesalib/src/mesa/program/program.c b/mesalib/src/mesa/program/program.c
index 2393a6386..5a9bc0fae 100644
--- a/mesalib/src/mesa/program/program.c
+++ b/mesalib/src/mesa/program/program.c
@@ -388,8 +388,9 @@ _mesa_delete_program(struct gl_context *ctx, struct gl_program *prog)
    if (prog->String)

       free(prog->String);

 

-   _mesa_free_instructions(prog->Instructions, prog->NumInstructions);

-

+   if (prog->Instructions) {

+      _mesa_free_instructions(prog->Instructions, prog->NumInstructions);

+   }

    if (prog->Parameters) {

       _mesa_free_parameter_list(prog->Parameters);

    }

@@ -1031,7 +1032,8 @@ _mesa_postprocess_program(struct gl_context *ctx, struct gl_program *prog)
    GLuint i;

    GLuint whiteSwizzle;

    GLint whiteIndex = _mesa_add_unnamed_constant(prog->Parameters,

-                                                 white, 4, &whiteSwizzle);

+                                                 (gl_constant_value *) white,

+                                                 4, &whiteSwizzle);

 

    (void) whiteIndex;