Attachment 87954 Details for Bug 70435 – Potential fix

Potential fix

0001-i965-Fix-glTexImage-when-packing-alignment-cpp.patch (text/plain), 2.63 KB, created by Chad Versace on 2013-10-21 19:07:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chad Versace

Created: 2013-10-21 19:07:43 UTC

Size: 2.63 KB

patch

obsolete

>From b6a8dae0068c6b77bbbbb0bd41059fedd19c64ce Mon Sep 17 00:00:00 2001
>From: Chad Versace <chad.versace@linux.intel.com>
>Date: Fri, 18 Oct 2013 14:06:49 -0700
>Subject: [PATCH] i965: Fix glTexImage when packing alignment != cpp
>
>Fixes texture corruption of Weston clients on cairo-glesv2 backend.
>
>TODO: commit message
>TODO: full piglit run
>TODO: new piglit test
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70435
>Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
>---
> src/mesa/drivers/dri/i965/intel_tex_subimage.c | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
>diff --git a/src/mesa/drivers/dri/i965/intel_tex_subimage.c b/src/mesa/drivers/dri/i965/intel_tex_subimage.c
>index eacebec..0384bcc 100644
>--- a/src/mesa/drivers/dri/i965/intel_tex_subimage.c
>+++ b/src/mesa/drivers/dri/i965/intel_tex_subimage.c
>@@ -27,6 +27,7 @@
>  **************************************************************************/
> 
> #include "main/bufferobj.h"
>+#include "main/image.h"
> #include "main/macros.h"
> #include "main/mtypes.h"
> #include "main/pbo.h"
>@@ -532,6 +533,7 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx,
> {
>    struct brw_context *brw = brw_context(ctx);
>    struct intel_texture_image *image = intel_texture_image(texImage);
>+   int src_pitch;
> 
>    /* The miptree's buffer. */
>    drm_intel_bo *bo;
>@@ -544,6 +546,11 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx,
>    /* This fastpath is restricted to specific texture types: level 0 of
>     * a 2D BGRA, RGBA, L8 or A8 texture. It could be generalized to support
>     * more types.
>+    *
>+    * FINISHME: The restrictions below on packing alignment and packing row
>+    * length are likely unneeded now because we calculate the source stride
>+    * with _mesa_image_row_stride. However, before removing the restrictions
>+    * we need tests.
>     */
>    if (!brw->has_llc ||
>        type != GL_UNSIGNED_BYTE ||
>@@ -609,6 +616,8 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx,
>       return false;
>    }
> 
>+   src_pitch = _mesa_image_row_stride(packing, width, format, type);
>+
>    /* We postponed printing this message until having committed to executing
>     * the function.
>     */
>@@ -624,8 +633,8 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx,
>    linear_to_tiled(
>       xoffset * cpp, (xoffset + width) * cpp,
>       yoffset, yoffset + height,
>-      bo->virtual, pixels - (xoffset + yoffset * width) * cpp,
>-      image->mt->region->pitch, width * cpp,
>+      bo->virtual, pixels - yoffset * src_pitch - xoffset * cpp,
>+      image->mt->region->pitch, src_pitch,
>       brw->has_swizzling,
>       image->mt->region->tiling,
>       mem_copy
>-- 
>1.8.3.1
>

Actions: View

Attachments on bug 70435: 87569 | 87619 | 87898 | 87954

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.