From: Eric Anholt <eric@anholt.net>
Date: Fri, 25 Apr 2014 18:19:05 +0000 (-0700)
Subject: i965: Fix another broken offset-aligned-to-tile test.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ea2cac01e875a9953496c03057480fc3bf7fbc0e;p=mesa.git

i965: Fix another broken offset-aligned-to-tile test.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
---

diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index 0a82f1fa736..778d5008503 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -732,7 +732,6 @@ intel_from_planar(__DRIimage *parent, int plane, void *loaderPrivate)
 {
     int width, height, offset, stride, dri_format, index;
     struct intel_image_format *f;
-    uint32_t mask_x, mask_y;
     __DRIimage *image;
 
     if (parent == NULL || parent->planar_format == NULL)
@@ -777,8 +776,7 @@ intel_from_planar(__DRIimage *parent, int plane, void *loaderPrivate)
     image->offset = offset;
     intel_setup_image_from_dimensions(image);
 
-    intel_region_get_tile_masks(image->region, &mask_x, &mask_y, false);
-    if (offset & mask_x)
+    if (offset & 0xfff)
        _mesa_warning(NULL,
                      "intel_create_sub_image: offset not on tile boundary");