Attachment 82481 Details for Bug 66850 – patch 2/3

[patch] patch 2/3

0002-meta-handle-2D-texture-arrays-in-decompress_texture_.patch (text/plain), 2.07 KB, created by Brian Paul on 2013-07-16 13:15:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Paul

Created: 2013-07-16 13:15:55 UTC

Size: 2.07 KB

patch

obsolete

>From 7780f8ba0a9aaee86a82a948a1839a6a6b1c49fe Mon Sep 17 00:00:00 2001
>From: Brian Paul <brianp@vmware.com>
>Date: Tue, 16 Jul 2013 06:27:33 -0600
>Subject: [PATCH 2/3] meta: handle 2D texture arrays in
> decompress_texture_image()
>
>NOTE: This is a candidate for the 9.1 branch.
>---
> src/mesa/drivers/common/meta.c |   23 +++++++++++++++++++++--
> 1 file changed, 21 insertions(+), 2 deletions(-)
>
>diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
>index e848429..4a3497c 100644
>--- a/src/mesa/drivers/common/meta.c
>+++ b/src/mesa/drivers/common/meta.c
>@@ -4095,10 +4095,29 @@ _mesa_meta_GetTexImage(struct gl_context *ctx,
>        _mesa_get_format_datatype(texImage->TexFormat)
>        == GL_UNSIGNED_NORMALIZED) {
>       struct gl_texture_object *texObj = texImage->TexObject;
>-      const GLuint slice = 0; /* only 2D compressed textures for now */
>+      GLuint slice;
>       /* Need to unlock the texture here to prevent deadlock... */
>       _mesa_unlock_texture(ctx, texObj);
>-      decompress_texture_image(ctx, texImage, slice, format, type, pixels);
>+      for (slice = 0; slice < texImage->Depth; slice++) {
>+         void *dst;
>+         if (texImage->TexObject->Target == GL_TEXTURE_2D_ARRAY) {
>+            /* Setup pixel packing.  SkipPixels and SkipRows will be applied
>+             * in the decompress_texture_image() function's call to
>+             * glReadPixels but we need to compute the dest slice's address
>+             * here (according to SkipImages and ImageHeight).
>+             */
>+            struct gl_pixelstore_attrib packing = ctx->Pack;
>+            packing.SkipPixels = 0;
>+            packing.SkipRows = 0;
>+            dst = _mesa_image_address3d(&packing, pixels, texImage->Width,
>+                                        texImage->Height, format, type,
>+                                        slice, 0, 0);
>+         }
>+         else {
>+            dst = pixels;
>+         }
>+         decompress_texture_image(ctx, texImage, slice, format, type, dst);
>+      }
>       /* ... and relock it */
>       _mesa_lock_texture(ctx, texObj);
>    }
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 66850: 82363 | 82480 | 82481 | 82482 | 82505 | 82506

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.