Merge remote-tracking branch 'origin/released'

Conflicts:
	apps/xwininfo/configure.ac
	libX11/configure.ac
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glsl_parser_extras.cpp
	mesalib/src/glsl/glsl_parser_extras.h
	mesalib/src/glsl/ir.cpp
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/ir_constant_expression.cpp
	mesalib/src/glsl/ir_validate.cpp
	mesalib/src/glsl/lower_mat_op_to_vec.cpp
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mesalib/src/mesa/state_tracker/st_context.h
	mesalib/src/mesa/state_tracker/st_format.h
	mkfontscale/configure.ac
	xorg-server/Xext/xvmc.c
	xorg-server/configure.ac
	xorg-server/dix/Makefile.am
	xorg-server/fb/fbarc.c
	xorg-server/fb/fbgc.c
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glxdri2.c
	xorg-server/glx/glxscreens.c
	xorg-server/hw/xfree86/Makefile.am
	xorg-server/hw/xfree86/loader/Makefile.am
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/mach-startup/Makefile.am
	xorg-server/hw/xwin/XWin.rc
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/os/Makefile.am
	xorg-server/test/Makefile.am
	xorg-server/xfixes/region.c
	xorg-server/xkeyboard-config/symbols/ma

1 files changed, 1 insertions, 3 deletions

diff --git a/mesalib/src/glsl/lower_if_to_cond_assign.cpp b/mesalib/src/glsl/lower_if_to_cond_assign.cpp
index e3a1065d9..b637eb4fe 100644
--- a/mesalib/src/glsl/lower_if_to_cond_assign.cpp
+++ b/mesalib/src/glsl/lower_if_to_cond_assign.cpp
@@ -149,11 +149,9 @@ ir_visitor_status
 ir_if_to_cond_assign_visitor::visit_leave(ir_if *ir)
 {
    /* Only flatten when beyond the GPU's maximum supported nesting depth. */
-   if (this->depth <= this->max_depth)
+   if (this->depth-- <= this->max_depth)
       return visit_continue;
 
-   this->depth--;
-
    bool found_control_flow = false;
    ir_variable *cond_var;
    ir_assignment *assign;