brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renderer/native: Try 10 bpc formats for EGL surfaces

Browse Source 
For scanout on a secondary GPU, for the time being try only formats
which are guaranteed to be renderable with GLES3, which notably excludes
10 bpc formats without alpha channel.

v2:
* Use separate format array for 10 bpc formats without alpha.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3139>
This commit is contained in:
Michel Dänzer 2023-11-08 17:43:54 +01:00 committed by Marge Bot
parent e1f795ff79
commit 69e0ce36b1
2 changed files with 92 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/backends/native/meta-onscreen-native.c
View File

@ -1760,7 +1760,17 @@ choose_onscreen_egl_config (CoglOnscreen *onscreen,
MetaCrtcKms *crtc_kms = META_CRTC_KMS (onscreen_native->crtc);
EGLint attrs[MAX_EGL_CONFIG_ATTRIBS];
g_autoptr (GError) local_error = NULL;
static const uint32_t formats[] = {
static const uint32_t alphaless_10bpc_formats[] = {
GBM_FORMAT_XRGB2101010,
GBM_FORMAT_XBGR2101010,
GBM_FORMAT_RGBX1010102,
GBM_FORMAT_BGRX1010102,
};
static const uint32_t default_formats[] = {
GBM_FORMAT_ARGB2101010,
GBM_FORMAT_ABGR2101010,
GBM_FORMAT_RGBA1010102,
GBM_FORMAT_BGRA1010102,
GBM_FORMAT_XRGB8888,
GBM_FORMAT_ARGB8888,
};
@ -1769,12 +1779,27 @@ choose_onscreen_egl_config (CoglOnscreen *onscreen,
&cogl_display->onscreen_template->config,
attrs);
/* Secondary GPU contexts use GLES3, which doesn't guarantee that 10 bpc
* formats without alpha are renderable
*/
if (!should_surface_be_sharable (onscreen) &&
meta_renderer_native_choose_gbm_format (crtc_kms,
egl,
egl_display,
attrs,
alphaless_10bpc_formats,
G_N_ELEMENTS (alphaless_10bpc_formats),
"surface",
out_config,
error))
return TRUE;
if (meta_renderer_native_choose_gbm_format (crtc_kms,
egl,
egl_display,
attrs,
formats,
G_N_ELEMENTS (formats),
default_formats,
G_N_ELEMENTS (default_formats),
"surface",
out_config,
error))

77
src/backends/native/meta-renderer-native.c
View File

@ -1610,11 +1610,11 @@ meta_renderer_native_finish_frame (MetaRendererNative *renderer_native,
}
static gboolean
create_secondary_egl_config (MetaEgl *egl,
MetaRendererNativeMode mode,
EGLDisplay egl_display,
EGLConfig *egl_config,
GError **error)
create_secondary_egl_config (MetaEgl *egl,
MetaRendererNativeGpuData *renderer_gpu_data,
EGLDisplay egl_display,
EGLConfig *egl_config,
GError **error)
{
EGLint attributes[] = {
EGL_RED_SIZE, 1,
@ -1627,16 +1627,67 @@ create_secondary_egl_config (MetaEgl *egl,
EGL_NONE
};
switch (mode)
switch (renderer_gpu_data->mode)
{
case META_RENDERER_NATIVE_MODE_GBM:
case META_RENDERER_NATIVE_MODE_SURFACELESS:
return choose_egl_config_from_gbm_format (egl,
egl_display,
attributes,
GBM_FORMAT_XRGB8888,
egl_config,
error);
{
MetaGpuKms *gpu_kms = renderer_gpu_data->gpu_kms;
static const uint32_t gles3_formats[] = {
GBM_FORMAT_ARGB2101010,
GBM_FORMAT_ABGR2101010,
GBM_FORMAT_RGBA1010102,
GBM_FORMAT_BGRA1010102,
GBM_FORMAT_XRGB8888,
GBM_FORMAT_ARGB8888,
};
int i;
for (i = 0; i < G_N_ELEMENTS (gles3_formats); i++)
{
g_clear_error (error);
if (gpu_kms)
{
GList *l;
for (l = meta_gpu_get_crtcs (META_GPU (gpu_kms)); l; l = l->next)
{
MetaCrtc *crtc = l->data;
if (!meta_crtc_kms_supports_format (META_CRTC_KMS (crtc), gles3_formats[i]))
break;
}
/* If any CRTC doesn't support the format, we can't use it */
if (l)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"KMS CRTC doesn't support GBM format");
continue;
}
}
if (choose_egl_config_from_gbm_format (egl,
egl_display,
attributes,
gles3_formats[i],
egl_config,
error))
{
MetaDrmFormatBuf format_string;
meta_drm_format_to_string (&format_string, gles3_formats[i]);
meta_topic (META_DEBUG_KMS,
"Using GBM format %s for secondary GPU EGL",
format_string.s);
return TRUE;
}
}
return FALSE;
}
#ifdef HAVE_EGL_DEVICE
case META_RENDERER_NATIVE_MODE_EGL_DEVICE:
return meta_egl_choose_first_config (egl,
@ -1728,7 +1779,7 @@ init_secondary_gpu_data_gpu (MetaRendererNativeGpuData *renderer_gpu_data,
meta_egl_bind_api (egl, EGL_OPENGL_ES_API, NULL);
if (!create_secondary_egl_config (egl, renderer_gpu_data->mode, egl_display,
if (!create_secondary_egl_config (egl, renderer_gpu_data, egl_display,
&egl_config, error))
goto out;