Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/docs/GL3.txt
	mesalib/src/glsl/linker.cpp
	mesalib/src/mesa/main/depthstencil.c
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/formats.c
	mesalib/src/mesa/main/formats.h
	mesalib/src/mesa/main/framebuffer.c
	mesalib/src/mesa/main/mtypes.h
	mesalib/src/mesa/main/pack.c
	mesalib/src/mesa/main/readpix.c
	mesalib/src/mesa/main/renderbuffer.c
	mesalib/src/mesa/main/samplerobj.c
	mesalib/src/mesa/main/shaderapi.c
	mesalib/src/mesa/main/texenv.c
	mesalib/src/mesa/main/texobj.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/state_tracker/st_cb_clear.c
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_cb_readpixels.c
	mesalib/src/mesa/state_tracker/st_extensions.c
	mesalib/src/mesa/state_tracker/st_format.c
	mesalib/src/mesa/swrast/s_readpix.c

1 files changed, 8 insertions, 2 deletions

diff --git a/mesalib/src/mesa/main/framebuffer.c b/mesalib/src/mesa/main/framebuffer.c
index 6acfa7660..ac104a2ce 100644
--- a/mesalib/src/mesa/main/framebuffer.c
+++ b/mesalib/src/mesa/main/framebuffer.c
@@ -631,8 +631,14 @@ _mesa_update_depth_buffer(struct gl_context *ctx,
           || fb->_DepthBuffer->Wrapped != depthRb

           || _mesa_get_format_base_format(fb->_DepthBuffer->Format) != GL_DEPTH_COMPONENT) {

          /* need to update wrapper */

-         struct gl_renderbuffer *wrapper

-            = _mesa_new_z24_renderbuffer_wrapper(ctx, depthRb);

+         struct gl_renderbuffer *wrapper;

+

+         if (depthRb->Format == MESA_FORMAT_Z32_FLOAT_X24S8) {

+            wrapper = _mesa_new_z32f_renderbuffer_wrapper(ctx, depthRb);

+         }

+         else {

+            wrapper = _mesa_new_z24_renderbuffer_wrapper(ctx, depthRb);

+         }

          _mesa_reference_renderbuffer(&fb->_DepthBuffer, wrapper);

          ASSERT(fb->_DepthBuffer->Wrapped == depthRb);

       }