diff --git a/src/panfrost/lib/pan_afbc.h b/src/panfrost/lib/pan_afbc.h index 858eda01c61..5e87f35e70d 100644 --- a/src/panfrost/lib/pan_afbc.h +++ b/src/panfrost/lib/pan_afbc.h @@ -566,6 +566,7 @@ pan_afbc_format(unsigned arch, enum pipe_format format, unsigned plane_idx) case PIPE_FORMAT_Z24_UNORM_S8_UINT: return PAN_AFBC_MODE_R8G8B8A8; case PIPE_FORMAT_Z24X8_UNORM: return PAN_AFBC_MODE_R8G8B8A8; case PIPE_FORMAT_X24S8_UINT: return PAN_AFBC_MODE_R8G8B8A8; + case PIPE_FORMAT_Z24_UNORM_PACKED: return PAN_AFBC_MODE_R8G8B8; /* AFBC(S8) only supported on v9+ */ case PIPE_FORMAT_S8_UINT: diff --git a/src/panfrost/lib/pan_desc.c b/src/panfrost/lib/pan_desc.c index 0c34251e27d..4215d11d8b0 100644 --- a/src/panfrost/lib/pan_desc.c +++ b/src/panfrost/lib/pan_desc.c @@ -140,6 +140,8 @@ translate_zs_format(enum pipe_format in) return MALI_ZS_FORMAT_D24S8; case PIPE_FORMAT_Z24X8_UNORM: return MALI_ZS_FORMAT_D24X8; + case PIPE_FORMAT_Z24_UNORM_PACKED: + return MALI_ZS_FORMAT_D24; case PIPE_FORMAT_Z32_FLOAT: return MALI_ZS_FORMAT_D32; #if PAN_ARCH < 9 diff --git a/src/panfrost/lib/pan_encoder.h b/src/panfrost/lib/pan_encoder.h index fb62cda3059..491536af752 100644 --- a/src/panfrost/lib/pan_encoder.h +++ b/src/panfrost/lib/pan_encoder.h @@ -269,6 +269,7 @@ pan_get_z_internal_format(enum pipe_format fmt) return MALI_Z_INTERNAL_FORMAT_D16; case PIPE_FORMAT_Z24_UNORM_S8_UINT: case PIPE_FORMAT_Z24X8_UNORM: + case PIPE_FORMAT_Z24_UNORM_PACKED: return MALI_Z_INTERNAL_FORMAT_D24; case PIPE_FORMAT_Z32_FLOAT: case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT: diff --git a/src/panfrost/lib/pan_format.c b/src/panfrost/lib/pan_format.c index 06756557e15..5a530a4e526 100644 --- a/src/panfrost/lib/pan_format.c +++ b/src/panfrost/lib/pan_format.c @@ -563,6 +563,7 @@ const struct pan_format GENX(pan_pipe_format)[PIPE_FORMAT_COUNT] = { * we want stencil in the red channel, so we use the GRBA swizzles. */ FMT(Z32_FLOAT_S8X24_UINT, R32F, GRBA, L, _T_Z_), + FMT(Z24_UNORM_PACKED, Z24X8_UNORM, RGBA, L, _T_Z_), FMT(X32_S8X24_UINT, S8, GRBA, L, _T_Z_), FMT(X24S8_UINT, S8, GRBA, L, _T_Z_), FMT(S8_UINT, S8, GRBA, L, _T_Z_),