From: Francisco Jerez <currojerez@riseup.net>
Date: Tue, 12 May 2015 13:10:07 +0000 (+0300)
Subject: i965: Add SKL support to brw_miptree_get_horizontal_slice_pitch().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f9094691378722304dd94deb76ad013bd65c7a5b;p=mesa.git

i965: Add SKL support to brw_miptree_get_horizontal_slice_pitch().

Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
---

diff --git a/src/mesa/drivers/dri/i965/brw_tex_layout.c b/src/mesa/drivers/dri/i965/brw_tex_layout.c
index c9ee5265a1d..b8b03932065 100644
--- a/src/mesa/drivers/dri/i965/brw_tex_layout.c
+++ b/src/mesa/drivers/dri/i965/brw_tex_layout.c
@@ -432,9 +432,7 @@ brw_miptree_get_horizontal_slice_pitch(const struct brw_context *brw,
                                        const struct intel_mipmap_tree *mt,
                                        unsigned level)
 {
-   assert(brw->gen < 9);
-
-   if (mt->target == GL_TEXTURE_3D ||
+   if ((brw->gen < 9 && mt->target == GL_TEXTURE_3D) ||
        (brw->gen == 4 && mt->target == GL_TEXTURE_CUBE_MAP)) {
       return ALIGN(minify(mt->physical_width0, level), mt->align_w);
    } else {