Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/mesa/main/mtypes.h
	mesalib/src/mesa/main/shaderapi.c
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/program/prog_optimize.c
	mesalib/src/mesa/state_tracker/st_cb_blit.c
	xorg-server/xkeyboard-config/rules/base.o_s.part
	xorg-server/xkeyboard-config/rules/base.xml.in

1 files changed, 5 insertions, 3 deletions

diff --git a/mesalib/src/mesa/program/prog_optimize.c b/mesalib/src/mesa/program/prog_optimize.c
index bb908067d..70e2d85eb 100644
--- a/mesalib/src/mesa/program/prog_optimize.c
+++ b/mesalib/src/mesa/program/prog_optimize.c
@@ -472,8 +472,7 @@ can_downward_mov_be_modifed(const struct prog_instruction *mov)
       mov->SrcReg[0].HasIndex2 == 0 &&

       mov->SrcReg[0].RelAddr2 == 0 &&

       mov->DstReg.RelAddr == 0 &&

-      mov->DstReg.CondMask == COND_TR &&

-      mov->SaturateMode == SATURATE_OFF;

+      mov->DstReg.CondMask == COND_TR;

 }

 

 

@@ -482,7 +481,8 @@ can_upward_mov_be_modifed(const struct prog_instruction *mov)
 {

    return

       can_downward_mov_be_modifed(mov) &&

-      mov->DstReg.File == PROGRAM_TEMPORARY;

+      mov->DstReg.File == PROGRAM_TEMPORARY &&

+      mov->SaturateMode == SATURATE_OFF;

 }

 

 

@@ -657,6 +657,8 @@ _mesa_merge_mov_into_inst(struct prog_instruction *inst,
    if (mask != (inst->DstReg.WriteMask & mask))

       return GL_FALSE;

 

+   inst->SaturateMode |= mov->SaturateMode;

+

    /* Depending on the instruction, we may need to recompute the swizzles.

     * Also, some other instructions (like TEX) are not linear. We will only

     * consider completely active sources and destinations