Merge remote-tracking branch 'origin/released'

Conflicts:
	libxcb/src/xcb_in.c
	mesalib/src/mesa/main/formats.c
	mesalib/src/mesa/main/mtypes.h
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
	mesalib/src/mesa/state_tracker/st_extensions.c
	mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
	mesalib/src/mesa/swrast/s_context.c
	mesalib/src/mesa/swrast/s_readpix.c

1 files changed, 5 insertions, 5 deletions

diff --git a/mesalib/src/mesa/program/ir_to_mesa.cpp b/mesalib/src/mesa/program/ir_to_mesa.cpp
index 1540eb77e..a29bf31f8 100644
--- a/mesalib/src/mesa/program/ir_to_mesa.cpp
+++ b/mesalib/src/mesa/program/ir_to_mesa.cpp
@@ -3119,7 +3119,7 @@ get_mesa_program(struct gl_context *ctx,
 

       switch (mesa_inst->Opcode) {

       case OPCODE_IF:

-	 if (options->EmitNoIfs) {

+	 if (options->MaxIfDepth == 0) {

 	    linker_warning(shader_program,

 			   "Couldn't flatten if-statement.  "

 			   "This will likely result in software "

@@ -3232,7 +3232,7 @@ _mesa_ir_link_shader(struct gl_context *ctx, struct gl_shader_program *prog)
 	 /* Lowering */

 	 do_mat_op_to_vec(ir);

 	 lower_instructions(ir, (MOD_TO_FRACT | DIV_TO_MUL_RCP | EXP_TO_EXP2

-				 | LOG_TO_LOG2

+				 | LOG_TO_LOG2 | INT_DIV_TO_MUL_RCP

 				 | ((options->EmitNoPow) ? POW_TO_EXP2 : 0)));

 

 	 progress = do_lower_jumps(ir, true, true, options->EmitNoMainReturn, options->EmitNoCont, options->EmitNoLoops) || progress;

@@ -3241,10 +3241,10 @@ _mesa_ir_link_shader(struct gl_context *ctx, struct gl_shader_program *prog)
 

 	 progress = lower_quadop_vector(ir, true) || progress;

 

-	 if (options->EmitNoIfs) {

+	 if (options->MaxIfDepth == 0)

 	    progress = lower_discard(ir) || progress;

-	    progress = lower_if_to_cond_assign(ir) || progress;

-	 }

+

+	 progress = lower_if_to_cond_assign(ir, options->MaxIfDepth) || progress;

 

 	 if (options->EmitNoNoise)

 	    progress = lower_noise(ir) || progress;