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

renderer/native: Refactor meta_renderer_native_choose_gbm_format helper

Browse Source 
Preparation for the following commits, no functional change intended.

v2:
* Pass through MetaEgl pointer
v3:
* Make it return gboolean (Robert Mader)
v4:
* Add debug logging and corresponding purpose parameter
v5:
* Fix excessive function parameter indentation (Jonas Ådahl)

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3139>
This commit is contained in:
Michel Dänzer 2023-07-18 12:21:36 +02:00 committed by Marge Bot
parent e437c854cd
commit 4c42eab358
2 changed files with 55 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,6 +56,7 @@
#include "backends/native/meta-device-pool.h" #include "backends/native/meta-device-pool.h"
#include "backends/native/meta-kms-cursor-manager.h" #include "backends/native/meta-kms-cursor-manager.h"
#include "backends/native/meta-kms-device.h" #include "backends/native/meta-kms-device.h"
#include "backends/native/meta-kms-utils.h"
#include "backends/native/meta-kms.h" #include "backends/native/meta-kms.h"
#include "backends/native/meta-onscreen-native.h" #include "backends/native/meta-onscreen-native.h"
#include "backends/native/meta-output-kms.h" #include "backends/native/meta-output-kms.h"
@ -410,6 +411,43 @@ choose_egl_config_from_gbm_format (MetaEgl *egl,
return FALSE; return FALSE;
} }
gboolean
meta_renderer_native_choose_gbm_format (MetaEgl *egl,
EGLDisplay egl_display,
EGLint *attributes,
const uint32_t *formats,
size_t num_formats,
const char *purpose,
EGLConfig *out_config,
GError **error)
{
int i;
for (i = 0; i < num_formats; i++)
{
g_clear_error (error);
if (choose_egl_config_from_gbm_format (egl,
egl_display,
attributes,
formats[i],
out_config,
error))
{
MetaDrmFormatBuf format_string;
meta_drm_format_to_string (&format_string, formats[i]);
meta_topic (META_DEBUG_KMS,
"Using GBM format %s for primary GPU EGL %s",
format_string.s, purpose);
return TRUE;
}
}
return FALSE;
}
static gboolean static gboolean
meta_renderer_native_choose_egl_config (CoglDisplay *cogl_display, meta_renderer_native_choose_egl_config (CoglDisplay *cogl_display,
EGLint *attributes, EGLint *attributes,
@ -432,22 +470,15 @@ meta_renderer_native_choose_egl_config (CoglDisplay *cogl_display,
GBM_FORMAT_XRGB8888, GBM_FORMAT_XRGB8888,
GBM_FORMAT_ARGB8888, GBM_FORMAT_ARGB8888,
}; };
int i;
for (i = 0; i < G_N_ELEMENTS (formats); i++) return meta_renderer_native_choose_gbm_format (egl,
{
g_clear_error (error);
if (choose_egl_config_from_gbm_format (egl,
egl_display, egl_display,
attributes, attributes,
formats[i], formats,
G_N_ELEMENTS (formats),
"fallback",
out_config, out_config,
error)) error);
return TRUE;
}
return FALSE;
} }
case META_RENDERER_NATIVE_MODE_SURFACELESS: case META_RENDERER_NATIVE_MODE_SURFACELESS:
*out_config = EGL_NO_CONFIG_KHR; *out_config = EGL_NO_CONFIG_KHR;

9
src/backends/native/meta-renderer-native.h
View File

@ -75,3 +75,12 @@ gboolean meta_renderer_native_use_modifiers (MetaRendererNative *renderer_native
gboolean meta_renderer_native_has_addfb2 (MetaRendererNative *renderer_native); gboolean meta_renderer_native_has_addfb2 (MetaRendererNative *renderer_native);
MetaRendererNativeMode meta_renderer_native_get_mode (MetaRendererNative *renderer_native); MetaRendererNativeMode meta_renderer_native_get_mode (MetaRendererNative *renderer_native);
gboolean meta_renderer_native_choose_gbm_format (MetaEgl *egl,
EGLDisplay egl_display,
EGLint *attributes,
const uint32_t *formats,
size_t num_formats,
const char *purpose,
EGLConfig *out_config,
GError **error);