OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panfrost: add support for ASTC decode mode extension

Browse Source 
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30560>
This commit is contained in:
Louis-Francis Ratté-Boulianne
2024-08-08 00:52:16 -04:00
committed by Marge Bot
parent a4a51f22b1
commit 3967b4bf22
7 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/features.txt
View File

@@ -331,7 +331,7 @@ Khronos, ARB, and OES extensions that are not part of any OpenGL or OpenGL ES ve
GL_EXT_semaphore_win32 DONE (zink, d3d12)
GL_EXT_shader_group_vote DONE (all drivers that support GL_ARB_shader_group_vote)
GL_EXT_sRGB_write_control DONE (all drivers that support GLES 3.0+)
GL_EXT_texture_compression_astc_decode_mode DONE (core only)
GL_EXT_texture_compression_astc_decode_mode DONE (panfrost)
GL_EXT_texture_norm16 DONE (freedreno, r600, radeonsi, nvc0i, softpipe, zink, iris, crocus)
GL_EXT_texture_sRGB_R8 DONE (all drivers that support GLES 3.0+)
GL_KHR_blend_equation_advanced_coherent DONE (freedreno/a6xx, panfrost, zink, asahi, iris/gen9+)

10
src/gallium/drivers/panfrost/pan_cmdstream.c
View File

@@ -1606,9 +1606,10 @@ panfrost_create_sampler_view_bo(struct panfrost_sampler_view *so,
payload.gpu += pan_size(TEXTURE);
}
const struct util_format_description *desc =
util_format_description(format);
if ((device->debug & PAN_DBG_YUV) && panfrost_format_is_yuv(format)) {
const struct util_format_description *desc =
util_format_description(format);
if (desc->layout == UTIL_FORMAT_LAYOUT_SUBSAMPLED) {
iview.swizzle[2] = PIPE_SWIZZLE_1;
@@ -1618,6 +1619,11 @@ panfrost_create_sampler_view_bo(struct panfrost_sampler_view *so,
}
}
if (desc->layout == UTIL_FORMAT_LAYOUT_ASTC &&
so->base.astc_decode_format == PIPE_ASTC_DECODE_FORMAT_UNORM8) {
iview.astc.narrow = true;
}
GENX(panfrost_new_texture)(&iview, tex, &payload);
}

3
src/gallium/drivers/panfrost/pan_screen.c
View File

@@ -366,6 +366,9 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param)
case PIPE_CAP_NATIVE_FENCE_FD:
return 1;
case PIPE_CAP_ASTC_DECODE_MODE:
return dev->arch >= 9 && (dev->compressed_formats & (1 << 30));
default:
return u_pipe_screen_get_param_defaults(screen, param);
}

4
src/panfrost/lib/genxml/v10.xml
View File

@@ -110,8 +110,8 @@
<value name="ASTC 2D HDR" value="23"/>
<value name="AFBC" value="24"/>
<value name="AFRC" value="25"/>
<value name="ASTC 2D NARROW" value="62"/>
<value name="ASTC 3D NARROW" value="63"/>
<value name="ASTC 2D NARROW" value="30"/>
<value name="ASTC 3D NARROW" value="31"/>
<!-- Actual enum values follow -->
<value name="YUV8" value="32"/>

4
src/panfrost/lib/pan_format.c
View File

@@ -268,8 +268,8 @@ const struct panfrost_format GENX(panfrost_pipe_format)[PIPE_FORMAT_COUNT] = {
FMT(BPTC_RGBA_UNORM, RGBA8_UNORM, RGBA, L, _T__),
FMT(BPTC_SRGBA, RGBA8_UNORM, RGBA, S, _T__),
/* Mesa does not yet support astc_decode_mode extensions, so non-sRGB
* formats must be assumed to be wide.
/* If astc decode mode is set to RGBA8, the hardware format
* will be overriden to RGBA8_UNORM later on.
*/
FMT(ASTC_4x4, RGBA16F, RGBA, L, _T__),
FMT(ASTC_5x4, RGBA16F, RGBA, L, _T__),

21
src/panfrost/lib/pan_texture.c
View File

@@ -357,7 +357,8 @@ translate_superblock_size(uint64_t modifier)
}
static void
panfrost_emit_plane(int index, const struct pan_image_layout *layout,
panfrost_emit_plane(const struct pan_image_view *iview, int index,
const struct pan_image_layout *layout,
enum pipe_format format, mali_ptr pointer, unsigned level,
int32_t row_stride, int32_t surface_stride,
mali_ptr plane2_ptr, void **payload)
@@ -409,12 +410,10 @@ panfrost_emit_plane(int index, const struct pan_image_layout *layout,
/* sRGB formats decode to RGBA8 sRGB, which is narrow.
*
* Non-sRGB formats decode to RGBA16F which is wide.
* With a future extension, we could decode non-sRGB
* formats narrowly too, but this isn't wired up in Mesa
* yet.
* Non-sRGB formats decode to RGBA16F which is wide except if decode
* precision is set to GL_RGBA8 for that texture.
*/
cfg.astc.decode_wide = !srgb;
cfg.astc.decode_wide = !srgb && !iview->astc.narrow;
} else if (afbc) {
cfg.plane_type = MALI_PLANE_TYPE_AFBC;
cfg.afbc.superblock_size = translate_superblock_size(layout->modifier);
@@ -512,12 +511,12 @@ panfrost_emit_surface(const struct pan_image_view *iview, unsigned level,
/* 3-plane YUV requires equal stride for both chroma planes */
assert(row_strides[2] == 0 || row_strides[1] == row_strides[2]);
panfrost_emit_plane(i, layouts[i], format, plane_ptrs[i], level,
panfrost_emit_plane(iview, i, layouts[i], format, plane_ptrs[i], level,
row_strides[i], surface_strides[i], plane_ptrs[2],
payload);
}
} else {
panfrost_emit_plane(0, layouts[0], format, plane_ptrs[0], level,
panfrost_emit_plane(iview, 0, layouts[0], format, plane_ptrs[0], level,
row_strides[0], surface_strides[0], 0, payload);
}
return;
@@ -618,9 +617,15 @@ GENX(panfrost_new_texture)(const struct pan_image_view *iview, void *out,
const struct pan_image *base_image = pan_image_view_get_plane(iview, 0);
const struct pan_image_layout *layout = &base_image->layout;
enum pipe_format format = iview->format;
const struct util_format_description *desc = util_format_description(format);
uint32_t mali_format = GENX(panfrost_format_from_pipe_format)(format)->hw;
unsigned char swizzle[4];
if (desc->layout == UTIL_FORMAT_LAYOUT_ASTC && iview->astc.narrow &&
desc->colorspace != UTIL_FORMAT_COLORSPACE_SRGB) {
mali_format = MALI_PACK_FMT(RGBA8_UNORM, RGBA, L);
}
if (PAN_ARCH >= 7 && util_format_is_depth_or_stencil(format)) {
/* v7+ doesn't have an _RRRR component order, combine the
* user swizzle with a .XXXX swizzle to emulate that.

4
src/panfrost/lib/pan_texture.h
View File

@@ -147,6 +147,10 @@ struct pan_image_view {
unsigned offset;
unsigned size;
} buf;
struct {
unsigned narrow;
} astc;
};
static inline const struct pan_image *