svn merge ^/branches/released .

5 files changed, 126 insertions, 164 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
index 18ac6c8e0..2c4746622 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -1142,6 +1142,110 @@ copy_stencil_pixels(struct gl_context *ctx, GLint srcx, GLint srcy,
 }

 

 

+/** Do the src/dest regions overlap? */

+static GLboolean

+regions_overlap(GLint srcX, GLint srcY, GLint dstX, GLint dstY,

+                GLsizei width, GLsizei height)

+{

+   if (srcX + width <= dstX ||

+       dstX + width <= srcX ||

+       srcY + height <= dstY ||

+       dstY + height <= srcY)

+      return GL_FALSE;

+   else

+      return GL_TRUE;

+}

+

+

+/**

+ * Try to do a glCopyPixels for simple cases with a blit by calling

+ * pipe->resource_copy_region().

+ *

+ * We can do this when we're copying color pixels (depth/stencil

+ * eventually) with no pixel zoom, no pixel transfer ops, no

+ * per-fragment ops, the src/dest regions don't overlap and the

+ * src/dest pixel formats are the same.

+ */

+static GLboolean

+blit_copy_pixels(struct gl_context *ctx, GLint srcx, GLint srcy,

+                 GLsizei width, GLsizei height,

+                 GLint dstx, GLint dsty, GLenum type)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct gl_pixelstore_attrib pack, unpack;

+   GLint readX, readY, readW, readH;

+

+   if (type == GL_COLOR &&

+       ctx->Pixel.ZoomX == 1.0 &&

+       ctx->Pixel.ZoomY == 1.0 &&

+       ctx->_ImageTransferState == 0x0 &&

+       !ctx->Color.BlendEnabled &&

+       !ctx->Color.AlphaEnabled &&

+       !ctx->Depth.Test &&

+       !ctx->Fog.Enabled &&

+       !ctx->Stencil.Enabled &&

+       !ctx->FragmentProgram.Enabled &&

+       !ctx->VertexProgram.Enabled &&

+       !ctx->Shader.CurrentFragmentProgram &&

+       st_fb_orientation(ctx->ReadBuffer) == st_fb_orientation(ctx->DrawBuffer) &&

+       ctx->DrawBuffer->_NumColorDrawBuffers == 1) {

+      struct st_renderbuffer *rbRead, *rbDraw;

+      GLint drawX, drawY;

+

+      /*

+       * Clip the read region against the src buffer bounds.

+       * We'll still allocate a temporary buffer/texture for the original

+       * src region size but we'll only read the region which is on-screen.

+       * This may mean that we draw garbage pixels into the dest region, but

+       * that's expected.

+       */

+      readX = srcx;

+      readY = srcy;

+      readW = width;

+      readH = height;

+      pack = ctx->DefaultPacking;

+      if (!_mesa_clip_readpixels(ctx, &readX, &readY, &readW, &readH, &pack))

+         return GL_TRUE; /* all done */

+

+      /* clip against dest buffer bounds and scissor box */

+      drawX = dstx + pack.SkipPixels;

+      drawY = dsty + pack.SkipRows;

+      unpack = pack;

+      if (!_mesa_clip_drawpixels(ctx, &drawX, &drawY, &readW, &readH, &unpack))

+         return GL_TRUE; /* all done */

+

+      readX = readX - pack.SkipPixels + unpack.SkipPixels;

+      readY = readY - pack.SkipRows + unpack.SkipRows;

+

+      rbRead = st_get_color_read_renderbuffer(ctx);

+      rbDraw = st_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]);

+

+      if ((rbRead != rbDraw ||

+           !regions_overlap(readX, readY, drawX, drawY, readW, readH)) &&

+          rbRead->Base.Format == rbDraw->Base.Format) {

+         struct pipe_box srcBox;

+

+         /* flip src/dst position if needed */

+         if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {

+            /* both buffers will have the same orientation */

+            readY = ctx->ReadBuffer->Height - readY - readH;

+            drawY = ctx->DrawBuffer->Height - drawY - readH;

+         }

+

+         u_box_2d(readX, readY, readW, readH, &srcBox);

+

+         pipe->resource_copy_region(pipe,

+                                    rbDraw->texture, 0, drawX, drawY, 0,

+                                    rbRead->texture, 0, &srcBox);

+         return GL_TRUE;

+      }

+   }

+

+   return GL_FALSE;

+}

+

+

 static void

 st_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy,

               GLsizei width, GLsizei height,

@@ -1171,6 +1275,17 @@ st_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy,
       return;

    }

 

+   if (blit_copy_pixels(ctx, srcx, srcy, width, height, dstx, dsty, type))

+      return;

+

+   /*

+    * The subsequent code implements glCopyPixels by copying the source

+    * pixels into a temporary texture that's then applied to a textured quad.

+    * When we draw the textured quad, all the usual per-fragment operations

+    * are handled.

+    */

+

+

    /*

     * Get vertex/fragment shaders

     */

@@ -1271,7 +1386,7 @@ st_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy,
    if (srcFormat == texFormat) {

       struct pipe_box src_box;

       u_box_2d(readX, readY, readW, readH, &src_box);

-    /* copy source framebuffer surface into mipmap/texture */

+      /* copy source framebuffer surface into mipmap/texture */

       pipe->resource_copy_region(pipe,

                                  pt,                                /* dest tex */

                                  0,

@@ -1284,7 +1399,8 @@ st_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy,
    else {

       /* CPU-based fallback/conversion */

       struct pipe_transfer *ptRead =

-         pipe_get_transfer(st->pipe, rbRead->texture, 0, 0,

+         pipe_get_transfer(st->pipe, rbRead->texture,

+                           0, 0, /* level, layer */

                            PIPE_TRANSFER_READ,

                            readX, readY, readW, readH);

       struct pipe_transfer *ptTex;

@@ -1308,7 +1424,7 @@ st_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy,
          enum pipe_format readFormat, drawFormat;

          readFormat = util_format_linear(rbRead->texture->format);

          drawFormat = util_format_linear(pt->format);

-         pipe_get_tile_rgba_format(pipe, ptRead, readX, readY, readW, readH,

+         pipe_get_tile_rgba_format(pipe, ptRead, 0, 0, readW, readH,

                                    readFormat, buf);

          pipe_put_tile_rgba_format(pipe, ptTex, pack.SkipPixels, pack.SkipRows,

                                    readW, readH, drawFormat, buf);

@@ -1317,7 +1433,7 @@ st_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy,
       else {

          /* GL_DEPTH */

          GLuint *buf = (GLuint *) malloc(width * height * sizeof(GLuint));

-         pipe_get_tile_z(pipe, ptRead, readX, readY, readW, readH, buf);

+         pipe_get_tile_z(pipe, ptRead, 0, 0, readW, readH, buf);

          pipe_put_tile_z(pipe, ptTex, pack.SkipPixels, pack.SkipRows,

                          readW, readH, buf);

          free(buf);

diff --git a/mesalib/src/mesa/state_tracker/st_cb_fbo.c b/mesalib/src/mesa/state_tracker/st_cb_fbo.c
index 2934f9ffb..7e124186c 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_fbo.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_fbo.c
@@ -84,6 +84,7 @@ st_renderbuffer_alloc_storage(struct gl_context * ctx,
    strb->Base.Width  = width;

    strb->Base.Height = height;

    strb->Base.Format = st_pipe_format_to_mesa_format(format);

+   strb->Base._BaseFormat = _mesa_base_fbo_format(ctx, internalFormat);

    strb->Base.DataType = st_format_datatype(format);

 

    strb->defined = GL_FALSE;  /* undefined contents now */

@@ -234,6 +235,7 @@ st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw)
    strb->Base.ClassID = 0x4242; /* just a unique value */

    strb->Base.NumSamples = samples;

    strb->Base.Format = st_pipe_format_to_mesa_format(format);

+   strb->Base._BaseFormat = _mesa_get_format_base_format(strb->Base.Format);

    strb->Base.DataType = st_format_datatype(format);

    strb->format = format;

    strb->software = sw;

diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c
index ff04f3364..c0d1bd94a 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c
@@ -412,125 +412,6 @@ strip_texture_border(GLint border,
 

 

 /**

- * Try to do texture compression via rendering.  If the Gallium driver

- * can render into a compressed surface this will allow us to do texture

- * compression.

- * \return GL_TRUE for success, GL_FALSE for failure

- */

-static GLboolean

-compress_with_blit(struct gl_context * ctx,

-                   GLenum target, GLint level,

-                   GLint xoffset, GLint yoffset, GLint zoffset,

-                   GLint width, GLint height, GLint depth,

-                   GLenum format, GLenum type, const void *pixels,

-                   const struct gl_pixelstore_attrib *unpack,

-                   struct gl_texture_image *texImage)

-{

-   const GLuint dstImageOffsets[1] = {0};

-   struct st_texture_image *stImage = st_texture_image(texImage);

-   struct st_context *st = st_context(ctx);

-   struct pipe_context *pipe = st->pipe;

-   struct pipe_screen *screen = pipe->screen;

-   gl_format mesa_format;

-   struct pipe_resource templ;

-   struct pipe_resource *src_tex;

-   struct pipe_sampler_view view_templ;

-   struct pipe_sampler_view *src_view;

-   struct pipe_surface *dst_surface, surf_tmpl;

-   struct pipe_transfer *tex_xfer;

-   void *map;

-

-   if (!stImage->pt) {

-      /* XXX: Can this happen? Should we assert? */

-      return GL_FALSE;

-   }

-

-   /* get destination surface (in the compressed texture) */

-   memset(&surf_tmpl, 0, sizeof(surf_tmpl));

-   surf_tmpl.format = stImage->pt->format;

-   surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;

-   surf_tmpl.u.tex.level = stImage->level;

-   surf_tmpl.u.tex.first_layer = stImage->face;

-   surf_tmpl.u.tex.last_layer = stImage->face;

-   dst_surface = pipe->create_surface(pipe, stImage->pt, &surf_tmpl);

-   if (!dst_surface) {

-      /* can't render into this format (or other problem) */

-      return GL_FALSE;

-   }

-

-   /* Choose format for the temporary RGBA texture image.

-    */

-   mesa_format = st_ChooseTextureFormat(ctx, GL_RGBA, format, type);

-   assert(mesa_format);

-   if (!mesa_format)

-      return GL_FALSE;

-

-   /* Create the temporary source texture

-    */

-   memset(&templ, 0, sizeof(templ));

-   templ.target = st->internal_target;

-   templ.format = st_mesa_format_to_pipe_format(mesa_format);

-   templ.width0 = width;

-   templ.height0 = height;

-   templ.depth0 = 1;

-   templ.array_size = 1;

-   templ.last_level = 0;

-   templ.usage = PIPE_USAGE_DEFAULT;

-   templ.bind = PIPE_BIND_SAMPLER_VIEW;

-   src_tex = screen->resource_create(screen, &templ);

-

-   if (!src_tex)

-      return GL_FALSE;

-

-   /* Put user's tex data into the temporary texture

-    */

-   tex_xfer = pipe_get_transfer(st_context(ctx)->pipe, src_tex,

-                                0, 0, /* layer, level are zero */

-                                PIPE_TRANSFER_WRITE,

-                                0, 0, width, height); /* x, y, w, h */

-   map = pipe_transfer_map(pipe, tex_xfer);

-

-   _mesa_texstore(ctx, 2, GL_RGBA, mesa_format,

-                  map,              /* dest ptr */

-                  0, 0, 0,          /* dest x/y/z offset */

-                  tex_xfer->stride, /* dest row stride (bytes) */

-                  dstImageOffsets,  /* image offsets (for 3D only) */

-                  width, height, 1, /* size */

-                  format, type,     /* source format/type */

-                  pixels,           /* source data */

-                  unpack);          /* source data packing */

-

-   pipe_transfer_unmap(pipe, tex_xfer);

-   pipe->transfer_destroy(pipe, tex_xfer);

-

-   /* Create temporary sampler view */

-   u_sampler_view_default_template(&view_templ,

-                                   src_tex,

-                                   src_tex->format);

-   src_view = pipe->create_sampler_view(pipe, src_tex, &view_templ);

-

-

-   /* copy / compress image */

-   util_blit_pixels_tex(st->blit,

-                        src_view,         /* sampler view (src) */

-                        0, 0,             /* src x0, y0 */

-                        width, height,    /* src x1, y1 */

-                        dst_surface,      /* pipe_surface (dst) */

-                        xoffset, yoffset, /* dst x0, y0 */

-                        xoffset + width,  /* dst x1 */

-                        yoffset + height, /* dst y1 */

-                        0.0,              /* z */

-                        PIPE_TEX_MIPFILTER_NEAREST);

-

-   pipe_surface_reference(&dst_surface, NULL);

-   pipe_resource_reference(&src_tex, NULL);

-   pipe_sampler_view_reference(&src_view, NULL);

-

-   return GL_TRUE;

-}

-

-

-/**

  * Do glTexImage1/2/3D().

  */

 static void

@@ -547,7 +428,6 @@ st_TexImage(struct gl_context * ctx,
             GLsizei imageSize, GLboolean compressed_src)

 {

    struct st_context *st = st_context(ctx);

-   struct pipe_screen *screen = st->pipe->screen;

    struct st_texture_object *stObj = st_texture_object(texObj);

    struct st_texture_image *stImage = st_texture_image(texImage);

    GLuint dstRowStride = 0;

@@ -674,24 +554,6 @@ st_TexImage(struct gl_context * ctx,
 					   pixels, unpack, "glTexImage");

    }

 

-   /* See if we can do texture compression with a blit/render.

-    */

-   if (!compressed_src &&

-       !ctx->Mesa_DXTn &&

-       _mesa_is_format_compressed(texImage->TexFormat) &&

-       screen->is_format_supported(screen,

-                                   stImage->pt->format,

-                                   stImage->pt->target, 0,

-                                   PIPE_BIND_RENDER_TARGET, 0)) {

-      if (!pixels)

-         goto done;

-

-      if (compress_with_blit(ctx, target, level, 0, 0, 0, width, height, depth,

-                             format, type, pixels, unpack, texImage)) {

-         goto done;

-      }

-   }

-

    /*

     * Prepare to store the texture data.  Either map the gallium texture buffer

     * memory or malloc space for it.

@@ -1080,7 +942,6 @@ st_TexSubimage(struct gl_context *ctx, GLint dims, GLenum target, GLint level,
                struct gl_texture_image *texImage)

 {

    struct st_context *st = st_context(ctx);

-   struct pipe_screen *screen = st->pipe->screen;

    struct st_texture_image *stImage = st_texture_image(texImage);

    GLuint dstRowStride;

    const GLuint srcImageStride =

@@ -1100,22 +961,6 @@ st_TexSubimage(struct gl_context *ctx, GLint dims, GLenum target, GLint level,
    if (!pixels)

       return;

 

-   /* See if we can do texture compression with a blit/render.

-    */

-   if (!ctx->Mesa_DXTn &&

-       _mesa_is_format_compressed(texImage->TexFormat) &&

-       screen->is_format_supported(screen,

-                                   stImage->pt->format,

-                                   stImage->pt->target, 0,

-                                   PIPE_BIND_RENDER_TARGET, 0)) {

-      if (compress_with_blit(ctx, target, level,

-                             xoffset, yoffset, zoffset,

-                             width, height, depth,

-                             format, type, pixels, packing, texImage)) {

-         goto done;

-      }

-   }

-

    /* Map buffer if necessary.  Need to lock to prevent other contexts

     * from uploading the buffer under us.

     */

diff --git a/mesalib/src/mesa/state_tracker/st_draw.c b/mesalib/src/mesa/state_tracker/st_draw.c
index a31cbdc9e..564d63483 100644
--- a/mesalib/src/mesa/state_tracker/st_draw.c
+++ b/mesalib/src/mesa/state_tracker/st_draw.c
@@ -613,8 +613,10 @@ st_draw_vbo(struct gl_context *ctx,
    struct pipe_index_buffer ibuffer;

    struct pipe_draw_info info;

    unsigned i;

+   GLboolean new_array = GL_TRUE;

+   /* Fix this (Bug 34378):

    GLboolean new_array =

-         st->dirty.st && (st->dirty.mesa & (_NEW_ARRAY | _NEW_PROGRAM)) != 0;

+         st->dirty.st && (st->dirty.mesa & (_NEW_ARRAY | _NEW_PROGRAM)) != 0;*/

 

    /* Mesa core state should have been validated already */

    assert(ctx->NewState == 0x0);

diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index 76bd42cf8..b1ede1c8b 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -411,10 +411,7 @@ void st_init_extensions(struct st_context *st)
    if (screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA,

                                    PIPE_TEXTURE_2D, 0,

                                    PIPE_BIND_SAMPLER_VIEW, 0) &&

-       (ctx->Mesa_DXTn ||

-        screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA,

-                                    PIPE_TEXTURE_2D, 0,

-                                    PIPE_BIND_RENDER_TARGET, 0))) {

+       ctx->Mesa_DXTn) {

       ctx->Extensions.EXT_texture_compression_s3tc = GL_TRUE;

       ctx->Extensions.S3_s3tc = GL_TRUE;

    }