From: Dave Airlie <airlied@redhat.com>
Date: Tue, 1 Sep 2015 05:57:02 +0000 (+1000)
Subject: mesa/readpixels: check strides are equal before skipping conversion
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=32769ac016dee4ce5767a922f91de47df4ce984d;p=mesa.git

mesa/readpixels: check strides are equal before skipping conversion

The CTS packed_pixels test checks that readpixels doesn't write
into the space between rows, however we fail that here unless
we check the format and stride match.

This fixes all the core mesa problems with CTS packed_pixels
tests.

Cc: "11.0" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c
index 03a484c438c..76ef8ee9487 100644
--- a/src/mesa/main/readpix.c
+++ b/src/mesa/main/readpix.c
@@ -523,7 +523,8 @@ read_rgba_pixels( struct gl_context *ctx,
        * convert to, then we can convert directly into the dst buffer and avoid
        * the final conversion/copy from the rgba buffer to the dst buffer.
        */
-      if (dst_format == rgba_format) {
+      if (dst_format == rgba_format &&
+          dst_stride == rgba_stride) {
          need_convert = false;
          rgba = dst;
       } else {