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

6 files changed, 172 insertions, 17 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_cb_clear.c b/mesalib/src/mesa/state_tracker/st_cb_clear.c
index 31dcaf681..487e93d26 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_clear.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_clear.c
@@ -381,7 +381,8 @@ check_clear_depth_stencil_with_quad(struct gl_context *ctx, struct gl_renderbuff
 

    assert(rb->Format == MESA_FORMAT_S8 ||

           rb->Format == MESA_FORMAT_Z24_S8 ||

-          rb->Format == MESA_FORMAT_S8_Z24);

+          rb->Format == MESA_FORMAT_S8_Z24 ||

+          rb->Format == MESA_FORMAT_Z32_FLOAT_X24S8);

 

    if (ctx->Scissor.Enabled &&

        (ctx->Scissor.X != 0 ||

@@ -436,7 +437,8 @@ check_clear_stencil_with_quad(struct gl_context *ctx, struct gl_renderbuffer *rb
 

    assert(rb->Format == MESA_FORMAT_S8 ||

           rb->Format == MESA_FORMAT_Z24_S8 ||

-          rb->Format == MESA_FORMAT_S8_Z24);

+          rb->Format == MESA_FORMAT_S8_Z24 ||

+          rb->Format == MESA_FORMAT_Z32_FLOAT_X24S8);

 

    if (maskStencil) 

       return GL_TRUE;

diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
index cf0823a09..3947db613 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -812,6 +812,7 @@ draw_stencil_pixels(struct gl_context *ctx, GLint x, GLint y,
       for (row = 0; row < height; row++) {

          GLubyte sValues[MAX_WIDTH];

          GLuint zValues[MAX_WIDTH];

+         GLfloat *zValuesFloat = (GLfloat*)zValues;

          GLenum destType = GL_UNSIGNED_BYTE;

          const GLvoid *source = _mesa_image_address2d(&clippedUnpack, pixels,

                                                       width, height,

@@ -822,7 +823,11 @@ draw_stencil_pixels(struct gl_context *ctx, GLint x, GLint y,
                                    ctx->_ImageTransferState);

 

          if (format == GL_DEPTH_STENCIL) {

-            _mesa_unpack_depth_span(ctx, spanWidth, GL_UNSIGNED_INT, zValues,

+            GLenum ztype =

+               pt->resource->format == PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED ?

+               GL_FLOAT : GL_UNSIGNED_INT;

+

+            _mesa_unpack_depth_span(ctx, spanWidth, ztype, zValues,

                                     (1 << 24) - 1, type, source,

                                     &clippedUnpack);

          }

@@ -887,6 +892,26 @@ draw_stencil_pixels(struct gl_context *ctx, GLint x, GLint y,
                   }

                }

                break;

+            case PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED:

+               if (format == GL_DEPTH_STENCIL) {

+                  uint *dest = (uint *) (stmap + spanY * pt->stride + spanX*4);

+                  GLfloat *destf = (GLfloat*)dest;

+                  GLint k;

+                  assert(usage == PIPE_TRANSFER_WRITE);

+                  for (k = 0; k < spanWidth; k++) {

+                     destf[k*2] = zValuesFloat[k];

+                     dest[k*2+1] = sValues[k] & 0xff;

+                  }

+               }

+               else {

+                  uint *dest = (uint *) (stmap + spanY * pt->stride + spanX*4);

+                  GLint k;

+                  assert(usage == PIPE_TRANSFER_READ_WRITE);

+                  for (k = 0; k < spanWidth; k++) {

+                     dest[k*2+1] = sValues[k] & 0xff;

+                  }

+               }

+               break;

             default:

                assert(0);

             }

@@ -994,14 +1019,23 @@ st_DrawPixels(struct gl_context *ctx, GLint x, GLint y,
                                     GL_NONE, GL_NONE,

                                     PIPE_TEXTURE_2D,

 				    0, PIPE_BIND_SAMPLER_VIEW);

-      if (tex_format == PIPE_FORMAT_Z24_UNORM_S8_USCALED)

-	 stencil_format = PIPE_FORMAT_X24S8_USCALED;

-      else if (tex_format == PIPE_FORMAT_S8_USCALED_Z24_UNORM)

-	 stencil_format = PIPE_FORMAT_S8X24_USCALED;

-      else

-	 stencil_format = PIPE_FORMAT_S8_USCALED;

-      if (stencil_format == PIPE_FORMAT_NONE)

-	 goto stencil_fallback;

+

+      switch (tex_format) {

+      case PIPE_FORMAT_Z24_UNORM_S8_USCALED:

+         stencil_format = PIPE_FORMAT_X24S8_USCALED;

+         break;

+      case PIPE_FORMAT_S8_USCALED_Z24_UNORM:

+         stencil_format = PIPE_FORMAT_S8X24_USCALED;

+         break;

+      case PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED:

+         stencil_format = PIPE_FORMAT_X32_S8X24_USCALED;

+         break;

+      case PIPE_FORMAT_S8_USCALED:

+         stencil_format = PIPE_FORMAT_S8_USCALED;

+         break;

+      default:

+         goto stencil_fallback;

+      }

    }

 

    /* Mesa state should be up to date by now */

@@ -1188,6 +1222,18 @@ copy_stencil_pixels(struct gl_context *ctx, GLint srcx, GLint srcy,
          assert(usage == PIPE_TRANSFER_WRITE);

          memcpy(dst, src, width);

          break;

+      case PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED:

+         {

+            uint *dst4 = (uint *) dst;

+            int j;

+            dst4++;

+            assert(usage == PIPE_TRANSFER_READ_WRITE);

+            for (j = 0; j < width; j++) {

+               *dst4 = src[j] & 0xff;

+               dst4 += 2;

+            }

+         }

+         break;

       default:

          assert(0);

       }

diff --git a/mesalib/src/mesa/state_tracker/st_cb_readpixels.c b/mesalib/src/mesa/state_tracker/st_cb_readpixels.c
index d85ef5d47..d992b4c30 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_readpixels.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_readpixels.c
@@ -151,6 +151,24 @@ st_read_stencil_pixels(struct gl_context *ctx, GLint x, GLint y,
             }

          }

          break;

+      case PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED:

+         if (format == GL_DEPTH_STENCIL) {

+            const uint *src = (uint *) (stmap + srcY * pt->stride);

+            const GLfloat *srcf = (const GLfloat*)src;

+            GLint k;

+            for (k = 0; k < width; k++) {

+               zValues[k] = srcf[k*2];

+               sValues[k] = src[k*2+1] & 0xff;

+            }

+         }

+         else {

+            const uint *src = (uint *) (stmap + srcY * pt->stride);

+            GLint k;

+            for (k = 0; k < width; k++) {

+               sValues[k] = src[k*2+1] & 0xff;

+            }

+         }

+         break;

       default:

          assert(0);

       }

@@ -159,7 +177,7 @@ st_read_stencil_pixels(struct gl_context *ctx, GLint x, GLint y,
       dest = _mesa_image_address2d(packing, pixels, width, height,

                                    format, type, j, 0);

       if (format == GL_DEPTH_STENCIL) {

-         _mesa_pack_depth_stencil_span(ctx, width, dest,

+         _mesa_pack_depth_stencil_span(ctx, width, type, dest,

                                        zValues, sValues, packing);

       }

       else {

@@ -568,6 +586,31 @@ st_readpixels(struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei h
             dst += dstStride;

          }

       }

+      else if (pformat == PIPE_FORMAT_Z32_FLOAT) {

+         for (i = 0; i < height; i++) {

+            GLfloat zfloat[MAX_WIDTH];

+            pipe_get_tile_raw(pipe, trans, 0, y, width, 1, zfloat, 0);

+            y += yStep;

+            _mesa_pack_depth_span(ctx, width, dst, type,

+                                  zfloat, &clippedPacking);

+            dst += dstStride;

+         }

+      }

+      else if (pformat == PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED) {

+         assert(format == GL_DEPTH_COMPONENT);

+         for (i = 0; i < height; i++) {

+            GLfloat zfloat[MAX_WIDTH];    /* Z32 */

+            GLfloat zfloat2[MAX_WIDTH*2]; /* Z32X32 */

+            pipe_get_tile_raw(pipe, trans, 0, y, width, 1, zfloat2, 0);

+            y += yStep;

+            for (j = 0; j < width; j++) {

+               zfloat[j] = zfloat2[j*2];

+            }

+            _mesa_pack_depth_span(ctx, width, dst, type,

+                                  zfloat, &clippedPacking);

+            dst += dstStride;

+         }

+      }

       else {

          /* RGBA format */

          /* Do a row at a time to flip image data vertically */

diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index 4a2963043..aa7b104f4 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -607,4 +607,15 @@ void st_init_extensions(struct st_context *st)
    if (screen->get_param(screen, PIPE_CAP_SM3)) {

       ctx->Extensions.ARB_shader_texture_lod = GL_TRUE;

    }

+

+   if (screen->is_format_supported(screen, PIPE_FORMAT_Z32_FLOAT,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_DEPTH_STENCIL |

+                                   PIPE_BIND_SAMPLER_VIEW) &&

+       screen->is_format_supported(screen, PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_DEPTH_STENCIL |

+                                   PIPE_BIND_SAMPLER_VIEW)) {

+      ctx->Extensions.ARB_depth_buffer_float = GL_TRUE;

+   }

 }

diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c
index 6964cdbb4..d24e5b8d0 100644
--- a/mesalib/src/mesa/state_tracker/st_format.c
+++ b/mesalib/src/mesa/state_tracker/st_format.c
@@ -68,42 +68,70 @@ GLenum
 st_format_datatype(enum pipe_format format)

 {

    const struct util_format_description *desc;

+   int i;

 

    desc = util_format_description(format);

    assert(desc);

 

+   /* Find the first non-VOID channel. */

+   for (i = 0; i < 4; i++) {

+       if (desc->channel[i].type != UTIL_FORMAT_TYPE_VOID) {

+           break;

+       }

+   }

+

    if (desc->layout == UTIL_FORMAT_LAYOUT_PLAIN) {

       if (format == PIPE_FORMAT_B5G5R5A1_UNORM ||

           format == PIPE_FORMAT_B5G6R5_UNORM) {

          return GL_UNSIGNED_SHORT;

       }

+      else if (format == PIPE_FORMAT_R11G11B10_FLOAT ||

+               format == PIPE_FORMAT_R9G9B9E5_FLOAT) {

+         return GL_FLOAT;

+      }

       else if (format == PIPE_FORMAT_Z24_UNORM_S8_USCALED ||

                format == PIPE_FORMAT_S8_USCALED_Z24_UNORM ||

                format == PIPE_FORMAT_Z24X8_UNORM ||

                format == PIPE_FORMAT_X8Z24_UNORM) {

          return GL_UNSIGNED_INT_24_8;

       }

+      else if (format == PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED) {

+         return GL_FLOAT_32_UNSIGNED_INT_24_8_REV;

+      }

       else {

          const GLuint size = format_max_bits(format);

+

+         assert(i < 4);

+         if (i == 4)

+            return GL_NONE;

+

          if (size == 8) {

-            if (desc->channel[0].type == UTIL_FORMAT_TYPE_UNSIGNED)

+            if (desc->channel[i].type == UTIL_FORMAT_TYPE_UNSIGNED)

                return GL_UNSIGNED_BYTE;

             else

                return GL_BYTE;

          }

          else if (size == 16) {

-            if (desc->channel[0].type == UTIL_FORMAT_TYPE_UNSIGNED)

+            if (desc->channel[i].type == UTIL_FORMAT_TYPE_FLOAT)

+               return GL_HALF_FLOAT;

+            if (desc->channel[i].type == UTIL_FORMAT_TYPE_UNSIGNED)

                return GL_UNSIGNED_SHORT;

             else

                return GL_SHORT;

          }

-         else {

-            assert( size <= 32 );

-            if (desc->channel[0].type == UTIL_FORMAT_TYPE_UNSIGNED)

+         else if (size <= 32) {

+            if (desc->channel[i].type == UTIL_FORMAT_TYPE_FLOAT)

+               return GL_FLOAT;

+            if (desc->channel[i].type == UTIL_FORMAT_TYPE_UNSIGNED)

                return GL_UNSIGNED_INT;

             else

                return GL_INT;

          }

+         else {

+            assert(size == 64);

+            assert(desc->channel[i].type == UTIL_FORMAT_TYPE_FLOAT);

+            return GL_DOUBLE;

+         }

       }

    }

    else if (format == PIPE_FORMAT_UYVY) {

@@ -180,6 +208,10 @@ st_mesa_format_to_pipe_format(gl_format mesaFormat)
       return PIPE_FORMAT_Z24X8_UNORM;

    case MESA_FORMAT_S8:

       return PIPE_FORMAT_S8_USCALED;

+   case MESA_FORMAT_Z32_FLOAT:

+      return PIPE_FORMAT_Z32_FLOAT;

+   case MESA_FORMAT_Z32_FLOAT_X24S8:

+      return PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED;

    case MESA_FORMAT_YCBCR:

       return PIPE_FORMAT_UYVY;

 #if FEATURE_texture_s3tc

@@ -402,6 +434,10 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
       return MESA_FORMAT_X8_Z24;

    case PIPE_FORMAT_Z24_UNORM_S8_USCALED:

       return MESA_FORMAT_S8_Z24;

+   case PIPE_FORMAT_Z32_FLOAT:

+      return MESA_FORMAT_Z32_FLOAT;

+   case PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED:

+      return MESA_FORMAT_Z32_FLOAT_X24S8;

 

    case PIPE_FORMAT_UYVY:

       return MESA_FORMAT_YCBCR;

@@ -759,6 +795,10 @@ static const struct format_mapping format_map[] = {
       { GL_DEPTH_COMPONENT, 0 },

       { DEFAULT_DEPTH_FORMATS }

    },

+   {

+      { GL_DEPTH_COMPONENT32F, 0 },

+      { PIPE_FORMAT_Z32_FLOAT, 0 }

+   },

 

    /* stencil formats */

    {

@@ -775,6 +815,10 @@ static const struct format_mapping format_map[] = {
       { GL_DEPTH_STENCIL_EXT, GL_DEPTH24_STENCIL8_EXT, 0 },

       { PIPE_FORMAT_Z24_UNORM_S8_USCALED, PIPE_FORMAT_S8_USCALED_Z24_UNORM, 0 }

    },

+   {

+      { GL_DEPTH32F_STENCIL8, 0 },

+      { PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED, 0 }

+   },

 

    /* sRGB formats */

    {

diff --git a/mesalib/src/mesa/state_tracker/st_manager.c b/mesalib/src/mesa/state_tracker/st_manager.c
index a8c4b5c3f..7bd82aae2 100644
--- a/mesalib/src/mesa/state_tracker/st_manager.c
+++ b/mesalib/src/mesa/state_tracker/st_manager.c
@@ -918,6 +918,15 @@ st_manager_add_color_renderbuffer(struct st_context *st,
       return FALSE;
 
    st_framebuffer_update_attachments(stfb);
+
+   /*
+    * Force a call to the state tracker manager to validate the
+    * new renderbuffer. It might be that there is a window system
+    * renderbuffer available.
+    */
+   if(stfb->iface)
+      stfb->iface_stamp = p_atomic_read(&stfb->iface->stamp) - 1;
+
    st_invalidate_state(st->ctx, _NEW_BUFFERS);
 
    return TRUE;