sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

cogl: Require a Renderer/Display when initializing

Browse source 
The whole fallbacks all over the place were only useful when Cogl was a separate
library

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3857>
This commit is contained in:
Bilal Elmoussaoui 2024-07-03 09:13:42 +02:00 committed by Marge Bot
parent 54748b7f1f
commit 725e826a39
2 changed files with 6 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
cogl/cogl/cogl-context.c
View file

@ -182,6 +182,8 @@ CoglContext *
cogl_context_new (CoglDisplay *display, cogl_context_new (CoglDisplay *display,
GError **error) GError **error)
{ {
g_return_val_if_fail (display != NULL, NULL);
CoglContext *context; CoglContext *context;
uint8_t white_pixel[] = { 0xff, 0xff, 0xff, 0xff }; uint8_t white_pixel[] = { 0xff, 0xff, 0xff, 0xff };
const CoglWinsysVtable *winsys; const CoglWinsysVtable *winsys;
@ -221,30 +223,7 @@ cogl_context_new (CoglDisplay *display,
memset (context->private_features, 0, sizeof (context->private_features)); memset (context->private_features, 0, sizeof (context->private_features));
memset (context->winsys_features, 0, sizeof (context->winsys_features)); memset (context->winsys_features, 0, sizeof (context->winsys_features));
if (!display) context->display = g_object_ref (display);
{
CoglRenderer *renderer = cogl_renderer_new ();
if (!cogl_renderer_connect (renderer, error))
{
g_object_unref (renderer);
g_object_unref (context);
return NULL;
}
display = cogl_display_new (renderer, NULL);
g_object_unref (renderer);
}
else
g_object_ref (display);
if (!cogl_display_setup (display, error))
{
g_object_unref (display);
g_object_unref (context);
return NULL;
}
context->display = display;
/* This is duplicated data, but it's much more convenient to have /* This is duplicated data, but it's much more convenient to have
the driver attached to the context and the value is accessed a the driver attached to the context and the value is accessed a

13
cogl/cogl/cogl-display.c
View file

@ -85,18 +85,11 @@ CoglDisplay *
cogl_display_new (CoglRenderer *renderer, cogl_display_new (CoglRenderer *renderer,
CoglOnscreenTemplate *onscreen_template) CoglOnscreenTemplate *onscreen_template)
{ {
g_return_val_if_fail (renderer != NULL, NULL);
CoglDisplay *display = g_object_new (COGL_TYPE_DISPLAY, NULL); CoglDisplay *display = g_object_new (COGL_TYPE_DISPLAY, NULL);
GError *error = NULL;
display->renderer = renderer;
if (renderer)
g_object_ref (renderer);
else
display->renderer = cogl_renderer_new ();
if (!cogl_renderer_connect (display->renderer, &error))
g_error ("Failed to connect to renderer: %s\n", error->message);
display->renderer = g_object_ref (renderer);
display->setup = FALSE; display->setup = FALSE;
cogl_display_set_onscreen_template (display, onscreen_template); cogl_display_set_onscreen_template (display, onscreen_template);