aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2016-06-04 21:22:21 -0700
committerJason Ekstrand <jason.ekstrand@intel.com>2016-06-22 12:26:43 -0700
commit5d24e9cfa126971518be662e57021322ebf67a9a (patch)
tree3f71ba3d814e7e0a4679e529237459f81f02a2c3
parent6a43204afa40359f73684d3ccc7db8c4dad6288b (diff)
isl/state: Use the layout for computing qpitch rather than dimensions
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. Reviewed-by: Chad Versace <chad.versace@intel.com> Cc: "12.0" <mesa-stable@lists.freedesktop.org>
-rw-r--r--src/intel/isl/isl_surface_state.c34
1 files changed, 15 insertions, 19 deletions
diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c
index 25d5e6c8aab..b2ab46b9e08 100644
--- a/src/intel/isl/isl_surface_state.c
+++ b/src/intel/isl/isl_surface_state.c
@@ -149,27 +149,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 {
@@ -184,6 +168,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 */