mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

intel/isl: Remove inconsistency when encoding Tile64 

We guard surface state encoding of tilings by macros when the encoded
value is not present on certain platforms. For gfx20 however, we added
these macros even when the existing ones for gfx125 were sufficient.
Remove the extra macros.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Rohan Garg <rohan.garg@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28284>
This commit is contained in:
Nanley Chery 2024-03-12 16:14:04 -04:00 committed by Marge Bot
parent 81d8c071ac
commit 8845f1e439
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/intel/isl/isl_emit_cpb.c
View File

@ -42,11 +42,8 @@ __gen_combine_address(__attribute__((unused)) void *data,
#if GFX_VERx10 >= 125
static const uint8_t isl_encode_tiling[] = {
[ISL_TILING_4] = TILE4,
#if GFX_VER >= 20
[ISL_TILING_64_XE2] = TILE64,
#else
[ISL_TILING_64] = TILE64,
#endif
[ISL_TILING_64_XE2] = TILE64,
};
#endif

6
src/intel/isl/isl_emit_depth_stencil.c
View File

@ -60,12 +60,10 @@ static const uint32_t isl_encode_ds_surftype[] = {
#if GFX_VER >= 9
static const uint8_t isl_encode_tiling[] = {
#if GFX_VER >= 20
[ISL_TILING_4] = TILE4,
[ISL_TILING_64_XE2] = TILE64,
#elif GFX_VERx10 >= 125
#if GFX_VERx10 >= 125
[ISL_TILING_4] = TILE4,
[ISL_TILING_64] = TILE64,
[ISL_TILING_64_XE2] = TILE64,
#else
[ISL_TILING_Y0] = NONE,
[ISL_TILING_SKL_Yf] = TILEYF,

6
src/intel/isl/isl_surface_state.c
View File

@ -44,12 +44,10 @@ __gen_combine_address(__attribute__((unused)) void *data,
static const uint8_t isl_encode_tiling[] = {
[ISL_TILING_LINEAR] = LINEAR,
[ISL_TILING_X] = XMAJOR,
#if GFX_VER >= 20
[ISL_TILING_4] = TILE4,
[ISL_TILING_64_XE2] = TILE64,
#elif GFX_VERx10 >= 125
#if GFX_VERx10 >= 125
[ISL_TILING_4] = TILE4,
[ISL_TILING_64] = TILE64,
[ISL_TILING_64_XE2] = TILE64,
#else
[ISL_TILING_Y0] = YMAJOR,
[ISL_TILING_ICL_Yf] = YMAJOR,