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

diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index c7e6e3649..455462b03 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -173,7 +173,7 @@ void st_init_limits(struct st_context *st)
       options->EmitNoNoise = TRUE;

 

       /* TODO: make these more fine-grained if anyone needs it */

-      options->EmitNoIfs = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH);

+      options->MaxIfDepth = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH);

       options->EmitNoLoops = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH);

       options->EmitNoFunctions = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_SUBROUTINES);

       options->EmitNoMainReturn = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_SUBROUTINES);

@@ -203,6 +203,9 @@ void st_init_limits(struct st_context *st)
 

    /* XXX we'll need a better query here someday */

    if (screen->get_param(screen, PIPE_CAP_GLSL)) {

+      c->MinProgramTexelOffset = screen->get_param(screen, PIPE_CAP_MIN_TEXEL_OFFSET);

+      c->MaxProgramTexelOffset = screen->get_param(screen, PIPE_CAP_MAX_TEXEL_OFFSET);

+

       c->GLSLVersion = 120;

    }

 }