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

clutter/stage-view: Pass the format when creating offscreens

Browse source 
Also use g_autoptr to make the code easier.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3930>
This commit is contained in:
Sebastian Wick 2024-08-08 00:04:31 +02:00 committed by Marge Bot
parent 163efa620b
commit 6a1749009f
1 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
clutter/clutter/clutter-stage-view.c
View file

@ -349,38 +349,41 @@ paint_transformed_framebuffer (ClutterStageView *view,
} }
static CoglOffscreen * static CoglOffscreen *
create_offscreen_framebuffer (ClutterStageView *view, create_offscreen (ClutterStageView *view,
int width, CoglPixelFormat format,
int height, int width,
GError **error) int height,
GError **error)
{ {
ClutterStageViewPrivate *priv = ClutterStageViewPrivate *priv =
clutter_stage_view_get_instance_private (view); clutter_stage_view_get_instance_private (view);
CoglPixelFormat format;
CoglContext *cogl_context; CoglContext *cogl_context;
CoglOffscreen *framebuffer; g_autoptr (CoglOffscreen) framebuffer = NULL;
CoglTexture *texture; g_autoptr (CoglTexture) texture = NULL;
format = cogl_framebuffer_get_internal_format (priv->framebuffer);
cogl_context = cogl_framebuffer_get_context (priv->framebuffer); cogl_context = cogl_framebuffer_get_context (priv->framebuffer);
texture = cogl_texture_2d_new_with_format (cogl_context, width, height, format);
if (format == COGL_PIXEL_FORMAT_ANY)
{
texture = cogl_texture_2d_new_with_size (cogl_context, width, height);
}
else
{
texture = cogl_texture_2d_new_with_format (cogl_context,
width, height, format);
}
cogl_texture_set_auto_mipmap (texture, FALSE); cogl_texture_set_auto_mipmap (texture, FALSE);
if (!cogl_texture_allocate (texture, error)) if (!cogl_texture_allocate (texture, error))
{ return FALSE;
g_object_unref (texture);
return FALSE;
}
framebuffer = cogl_offscreen_new_with_texture (texture); framebuffer = cogl_offscreen_new_with_texture (texture);
g_object_unref (texture);
if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (framebuffer), error))
{
g_object_unref (framebuffer);
return FALSE;
}
return framebuffer; if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (framebuffer), error))
return FALSE;
return g_steal_pointer (&framebuffer);
} }
static void static void
@ -389,14 +392,16 @@ init_shadowfb (ClutterStageView *view)
ClutterStageViewPrivate *priv = ClutterStageViewPrivate *priv =
clutter_stage_view_get_instance_private (view); clutter_stage_view_get_instance_private (view);
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
CoglPixelFormat format;
int width; int width;
int height; int height;
CoglOffscreen *offscreen; CoglOffscreen *offscreen;
format = cogl_framebuffer_get_internal_format (priv->framebuffer);
width = cogl_framebuffer_get_width (priv->framebuffer); width = cogl_framebuffer_get_width (priv->framebuffer);
height = cogl_framebuffer_get_height (priv->framebuffer); height = cogl_framebuffer_get_height (priv->framebuffer);
offscreen = create_offscreen_framebuffer (view, width, height, &error); offscreen = create_offscreen (view, format, width, height, &error);
if (!offscreen) if (!offscreen)
{ {
g_warning ("Failed to create shadow framebuffer: %s", error->message); g_warning ("Failed to create shadow framebuffer: %s", error->message);