brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt to CoglFramebuffers turning into GObjects

Browse Source 
Requires some more explicit type casting as things turned into 'void *'
less. Also memory management changes, as we can't use CoglObject
functions anymore for these objects.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1465
This commit is contained in:
Jonas Ådahl
2020-10-13 15:51:22 +02:00
committed by Georges Basile Stavracas Neto
parent a9349fbd3f
commit bd710ff4fd
4 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/shell-blur-effect.c
View File

@ -351,7 +351,7 @@ update_fbo (FramebufferData *data,
clutter_backend_get_cogl_context (clutter_get_default_backend ());
g_clear_pointer (&data->texture, cogl_object_unref);
g_clear_pointer (&data->framebuffer, cogl_object_unref);
g_clear_object (&data->framebuffer);
float new_width = floorf (width / downscale_factor);
float new_height = floorf (height / downscale_factor);
@ -362,7 +362,8 @@ update_fbo (FramebufferData *data,
cogl_pipeline_set_layer_texture (data->pipeline, 0, data->texture);
data->framebuffer = cogl_offscreen_new_with_texture (data->texture);
data->framebuffer =
COGL_FRAMEBUFFER (cogl_offscreen_new_with_texture (data->texture));
if (!data->framebuffer)
{
g_warning ("%s: Unable to create an Offscreen buffer", G_STRLOC);
@ -451,7 +452,7 @@ static void
clear_framebuffer_data (FramebufferData *fb_data)
{
g_clear_pointer (&fb_data->texture, cogl_object_unref);
g_clear_pointer (&fb_data->framebuffer, cogl_object_unref);
g_clear_object (&fb_data->framebuffer);
}
static float