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

diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index 8685f0ba0..5977f17f8 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -2266,11 +2266,6 @@ struct gl_shader_compiler_options
    /** Driver-selectable options: */

    GLboolean EmitCondCodes;             /**< Use condition codes? */

    GLboolean EmitNVTempInitialization;  /**< 0-fill NV temp registers */

-   /**

-    * Attempts to flatten all ir_if (OPCODE_IF) for GPUs that can't

-    * support control flow.

-    */

-   GLboolean EmitNoIfs;

    GLboolean EmitNoLoops;

    GLboolean EmitNoFunctions;

    GLboolean EmitNoCont;                  /**< Emit CONT opcode? */

@@ -2288,6 +2283,7 @@ struct gl_shader_compiler_options
    GLboolean EmitNoIndirectUniform; /**< No indirect addressing of constants */

    /*@}*/

 

+   GLuint MaxIfDepth;               /**< Maximum nested IF blocks */

    GLuint MaxUnrollIterations;

 

    struct gl_sl_pragmas DefaultPragmas; /**< Default #pragma settings */