For depth/stencil 1-D textures on SKL, we want them layed out in the old format that has been used since gen4. In order for the surface state fill-out code to handle, this it needs to distinguish based on layout rather than just dimensionality. --- src/intel/isl/isl_surface_state.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c index b16bcbf..2d36881 100644 --- a/src/intel/isl/isl_surface_state.c +++ b/src/intel/isl/isl_surface_state.c @@ -148,27 +148,11 @@ get_image_alignment(const struct isl_surf *surf) static uint32_t get_qpitch(const struct isl_surf *surf) { - switch (surf->dim) { + switch (surf->dim_layout) { default: unreachable("Bad isl_surf_dim"); - case ISL_SURF_DIM_1D: - if (GEN_GEN >= 9) { - /* QPitch is usually expressed as rows of surface elements (where - * a surface element is an compression block or a single surface - * sample). Skylake 1D is an outlier. - * - * From the Skylake BSpec >> Memory Views >> Common Surface - * Formats >> Surface Layout and Tiling >> 1D Surfaces: - * - * Surface QPitch specifies the distance in pixels between array - * slices. - */ - return isl_surf_get_array_pitch_el(surf); - } else { - return isl_surf_get_array_pitch_el_rows(surf); - } - case ISL_SURF_DIM_2D: - case ISL_SURF_DIM_3D: + case ISL_DIM_LAYOUT_GEN4_2D: + case ISL_DIM_LAYOUT_GEN4_3D: if (GEN_GEN >= 9) { return isl_surf_get_array_pitch_el_rows(surf); } else { @@ -183,6 +167,18 @@ get_qpitch(const struct isl_surf *surf) */ return isl_surf_get_array_pitch_sa_rows(surf); } + case ISL_DIM_LAYOUT_GEN9_1D: + /* QPitch is usually expressed as rows of surface elements (where + * a surface element is an compression block or a single surface + * sample). Skylake 1D is an outlier. + * + * From the Skylake BSpec >> Memory Views >> Common Surface + * Formats >> Surface Layout and Tiling >> 1D Surfaces: + * + * Surface QPitch specifies the distance in pixels between array + * slices. + */ + return isl_surf_get_array_pitch_el(surf); } } #endif /* GEN_GEN >= 8 */ -- 2.5.0.400.gff86faf _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev