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

gallium/st: add non-CSC lowering of YV12 as PIPE_FORMAT_R8_B8_G8_420

Browse source 
YV12 is the same as DRM_FORMAT_YVU420.
We lower it to PIPE_FORMAT_R8_B8_G8_420, which is equivalent to
PIPE_FORMAT_R8_G8_B8_420 with U/V planes swapped.

This is used for hardware that can sample from YUV but need CSC in shader.

Signed-off-by: Italo Nicola <italonicola@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24266>
This commit is contained in:
Italo Nicola 2023-07-21 00:31:48 +00:00 • committed by Marge Bot
parent 60ebef430a
commit b890a5ff61
9 changed files with 49 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/gallium/frontends/dri/dri2.c
View file

@ -858,6 +858,17 @@ dri2_update_tex_buffer(struct dri_drawable *drawable,
/* no-op */
}
static const struct dri2_format_mapping r8_b8_g8_mapping = {
DRM_FORMAT_YVU420,
__DRI_IMAGE_FORMAT_NONE,
__DRI_IMAGE_COMPONENTS_Y_U_V,
PIPE_FORMAT_R8_B8_G8_420_UNORM,
3,
{ { 0, 0, 0, __DRI_IMAGE_FORMAT_R8 },
{ 2, 1, 1, __DRI_IMAGE_FORMAT_R8 },
{ 1, 1, 1, __DRI_IMAGE_FORMAT_R8 } }
};
static const struct dri2_format_mapping r8_g8_b8_mapping = {
DRM_FORMAT_YUV420,
__DRI_IMAGE_FORMAT_NONE,
@ -964,13 +975,19 @@ dri2_create_image_from_winsys(__DRIscreen *_screen,
tex_usage |= PIPE_BIND_SAMPLER_VIEW;
}
/* For I420, see if we have support for sampling r8_g8_b8 */
if (!tex_usage && map->pipe_format == PIPE_FORMAT_IYUV &&
map->dri_fourcc == DRM_FORMAT_YUV420 &&
pscreen->is_format_supported(pscreen, PIPE_FORMAT_R8_G8_B8_420_UNORM,
screen->target, 0, 0, PIPE_BIND_SAMPLER_VIEW)) {
map = &r8_g8_b8_mapping;
tex_usage |= PIPE_BIND_SAMPLER_VIEW;
/* For YV12 and I420, see if we have support for sampling r8_b8_g8 or r8_g8_b8 */
if (!tex_usage && map->pipe_format == PIPE_FORMAT_IYUV) {
if (map->dri_fourcc == DRM_FORMAT_YUV420 &&
pscreen->is_format_supported(pscreen, PIPE_FORMAT_R8_G8_B8_420_UNORM,
screen->target, 0, 0, PIPE_BIND_SAMPLER_VIEW)) {
map = &r8_g8_b8_mapping;
tex_usage |= PIPE_BIND_SAMPLER_VIEW;
} else if (map->dri_fourcc == DRM_FORMAT_YVU420 &&
pscreen->is_format_supported(pscreen, PIPE_FORMAT_R8_B8_G8_420_UNORM,
screen->target, 0, 0, PIPE_BIND_SAMPLER_VIEW)) {
map = &r8_b8_g8_mapping;
tex_usage |= PIPE_BIND_SAMPLER_VIEW;
}
}
/* If the hardware supports R8G8_R8B8 style subsampled RGB formats, these

3
src/mesa/state_tracker/st_atom_sampler.c
View file

@ -298,7 +298,8 @@ update_shader_samplers(struct st_context *st,
states[extra] = sampler;
break;
case PIPE_FORMAT_IYUV:
if (stObj->pt->format == PIPE_FORMAT_R8_G8_B8_420_UNORM) {
if (stObj->pt->format == PIPE_FORMAT_R8_G8_B8_420_UNORM ||
stObj->pt->format == PIPE_FORMAT_R8_B8_G8_420_UNORM) {
/* no additional views needed */
break;
}

3
src/mesa/state_tracker/st_atom_texture.c
View file

@ -210,7 +210,8 @@ st_get_sampler_views(struct st_context *st,
pipe->create_sampler_view(pipe, stObj->pt->next, &tmpl);
break;
case PIPE_FORMAT_IYUV:
if (stObj->pt->format == PIPE_FORMAT_R8_G8_B8_420_UNORM)
if (stObj->pt->format == PIPE_FORMAT_R8_G8_B8_420_UNORM ||
stObj->pt->format == PIPE_FORMAT_R8_B8_G8_420_UNORM)
/* no additional views needed */
break;

14
src/mesa/state_tracker/st_cb_eglimage.c
View file

@ -210,6 +210,17 @@ is_i420_as_r8_g8_b8_420_supported(struct pipe_screen *screen,
return true;
}
if (out->format == PIPE_FORMAT_IYUV &&
out->texture->format == PIPE_FORMAT_R8_B8_G8_420_UNORM &&
screen->is_format_supported(screen, PIPE_FORMAT_R8_B8_G8_420_UNORM,
PIPE_TEXTURE_2D,
out->texture->nr_samples,
out->texture->nr_storage_samples,
usage)) {
*native_supported = false;
return true;
}
return false;
}
@ -391,7 +402,8 @@ st_bind_egl_image(struct gl_context *ctx,
texObj->RequiredTextureImageUnits = 1;
break;
case PIPE_FORMAT_IYUV:
if (stimg->texture->format == PIPE_FORMAT_R8_G8_B8_420_UNORM) {
if (stimg->texture->format == PIPE_FORMAT_R8_G8_B8_420_UNORM ||
stimg->texture->format == PIPE_FORMAT_R8_B8_G8_420_UNORM) {
texFormat = MESA_FORMAT_R8G8B8X8_UNORM;
texObj->RequiredTextureImageUnits = 1;
} else {

3
src/mesa/state_tracker/st_program.h
View file

@ -104,7 +104,8 @@ st_get_external_sampler_key(struct st_context *st, struct gl_program *prog)
key.lower_nv21 |= (1 << unit);
break;
case PIPE_FORMAT_IYUV:
if (stObj->pt->format == PIPE_FORMAT_R8_G8_B8_420_UNORM) {
if (stObj->pt->format == PIPE_FORMAT_R8_G8_B8_420_UNORM ||
stObj->pt->format == PIPE_FORMAT_R8_B8_G8_420_UNORM) {
key.lower_yuv |= (1 << unit);
break;
}

5
src/mesa/state_tracker/st_sampler_view.c
View file

@ -393,8 +393,9 @@ st_get_sampler_view_format(const struct st_context *st,
}
FALLTHROUGH;
case PIPE_FORMAT_IYUV:
if (texObj->pt->format == PIPE_FORMAT_R8_G8_B8_420_UNORM) {
format = PIPE_FORMAT_R8_G8_B8_420_UNORM;
if (texObj->pt->format == PIPE_FORMAT_R8_G8_B8_420_UNORM ||
texObj->pt->format == PIPE_FORMAT_R8_B8_G8_420_UNORM) {
format = texObj->pt->format;
break;
}
format = PIPE_FORMAT_R8_UNORM;

1
src/util/format/u_format.csv
View file

@ -408,6 +408,7 @@ PIPE_FORMAT_Y8_400_UNORM , other , 1, 1, 1, un8, , , , x0
PIPE_FORMAT_R8_G8B8_420_UNORM , planar2, 1, 1, 1, un8, , , , xyzw, rgb
PIPE_FORMAT_G8_B8R8_420_UNORM , planar2, 1, 1, 1, un8, , , , xyzw, rgb
PIPE_FORMAT_R8_G8_B8_420_UNORM , planar3, 1, 1, 1, un8, , , , xyzw, rgb
PIPE_FORMAT_R8_B8_G8_420_UNORM , planar3, 1, 1, 1, un8, , , , xyzw, rgb
PIPE_FORMAT_G8_B8_R8_420_UNORM , planar3, 1, 1, 1, un8, , , , xyzw, rgb
PIPE_FORMAT_R8_G8_B8_UNORM , planar3, 1, 1, 1, un8, , , , xyzw, rgb

Can't render this file because it contains an unexpected character in line 8 and column 3.

1
src/util/format/u_format_table.py
View file

@ -115,6 +115,7 @@ def has_access(format):
'r8_g8b8_420_unorm',
'g8_b8r8_420_unorm',
'r8_g8_b8_420_unorm',
'r8_b8_g8_420_unorm',
'g8_b8_r8_420_unorm',
'r8_g8_b8_unorm',
'y8_unorm',

1
src/util/format/u_formats.h
View file

@ -513,6 +513,7 @@ enum pipe_format {
PIPE_FORMAT_R8_G8B8_420_UNORM,
PIPE_FORMAT_G8_B8R8_420_UNORM,
PIPE_FORMAT_R8_G8_B8_420_UNORM,
PIPE_FORMAT_R8_B8_G8_420_UNORM,
PIPE_FORMAT_G8_B8_R8_420_UNORM,
PIPE_FORMAT_R8_G8_B8_UNORM,
PIPE_FORMAT_Y8_UNORM,