i965/blorp: Get rid of brw_blorp_surface_info::array_layout

Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>

diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c
index 96201e46aea53ff3bb7bf8127c0aa73e5b4384c0..48755fcc7a46b48d88264b66aa46f7bdedef449b 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_blorp.c
+++ b/src/mesa/drivers/dri/i965/brw_blorp.c
@@ -69,7 +69,6 @@ brw_blorp_surface_info_init(struct brw_context *brw,
    intel_miptree_get_image_offset(mt, level, layer,
                                   &info->x_offset, &info->y_offset);
 
-   info->array_layout = mt->array_layout;
    info->swizzle = SWIZZLE_XYZW;
 
    if (format == MESA_FORMAT_NONE)

diff --git a/src/mesa/drivers/dri/i965/brw_blorp.h b/src/mesa/drivers/dri/i965/brw_blorp.h
index d60b9887368549f48b4fae4c487c718c6dda9c1f..7aa67be12a3359de3b3d277bd9ea7ffa96a33b3e 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_blorp.h
+++ b/src/mesa/drivers/dri/i965/brw_blorp.h
@@ -118,15 +118,6 @@ struct brw_blorp_surface_info
     */
    uint32_t y_offset;
 
-   /**
-    * Indicates if we use the standard miptree layout (ALL_LOD_IN_EACH_SLICE),
-    * or if we tightly pack array slices at each LOD (ALL_SLICES_AT_EACH_LOD).
-    *
-    * If ALL_SLICES_AT_EACH_LOD is set, then ARYSPC_LOD0 can be used. Ignored
-    * prior to Gen7.
-    */
-   enum miptree_array_layout array_layout;
-
    /**
     * Format that should be used when setting up the surface state for this
     * surface.  Should correspond to one of the BRW_SURFACEFORMAT_* enums.