fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-09 10:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

isl/state: Use the layout for computing qpitch rather than dimensions

Browse source 
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>
(cherry picked from commit 5d24e9cfa1)
This commit is contained in:
Jason Ekstrand 2016-06-04 21:22:21 -07:00 • committed by Emil Velikov
parent 667beb92a9
commit 672872051d
1 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/intel/isl/isl_surface_state.c
View file

@ -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 */