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

utils: Pass a CoglContext to meta_create_texture

Browse Source 
Moves the global backend access from the function to the only
place where we don't have a way to get CoglContext in background
loading.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4201>
This commit is contained in:
Bilal Elmoussaoui 2024-12-30 18:24:30 +01:00 committed by Marge Bot
parent 5a2ef3ca4b
commit 98e887df48
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compositor/cogl-utils.c
View File

@ -68,7 +68,8 @@ meta_create_texture_pipeline (CoglContext *cogl_context,
* meta_create_texture: * meta_create_texture:
* @width: width of the texture to create * @width: width of the texture to create
* @height: height of the texture to create * @height: height of the texture to create
* @components; components to store in the texture (color or alpha) * @ctx: A #CoglContext
* @components: components to store in the texture (color or alpha)
* @flags: flags that affect the allocation behavior * @flags: flags that affect the allocation behavior
* *
* Creates a texture of the given size with the specified components * Creates a texture of the given size with the specified components
@ -84,11 +85,10 @@ meta_create_texture_pipeline (CoglContext *cogl_context,
CoglTexture * CoglTexture *
meta_create_texture (int width, meta_create_texture (int width,
int height, int height,
CoglContext *ctx,
CoglTextureComponents components, CoglTextureComponents components,
MetaTextureFlags flags) MetaTextureFlags flags)
{ {
ClutterBackend *backend = clutter_get_default_backend ();
CoglContext *ctx = clutter_backend_get_cogl_context (backend);
CoglTexture *texture; CoglTexture *texture;
texture = cogl_texture_2d_new_with_size (ctx, width, height); texture = cogl_texture_2d_new_with_size (ctx, width, height);

3
src/compositor/cogl-utils.h
View File

@ -31,8 +31,9 @@ typedef enum
META_TEXTURE_ALLOW_SLICING = 1 << 1 META_TEXTURE_ALLOW_SLICING = 1 << 1
} MetaTextureFlags; } MetaTextureFlags;
CoglTexture *meta_create_texture (int width, CoglTexture * meta_create_texture (int width,
int height, int height,
CoglContext *cogl_context,
CoglTextureComponents components, CoglTextureComponents components,
MetaTextureFlags flags); MetaTextureFlags flags);

4
src/compositor/meta-background-image.c
View File

@ -157,6 +157,8 @@ file_loaded (GObject *source_object,
GAsyncResult *result, GAsyncResult *result,
gpointer user_data) gpointer user_data)
{ {
ClutterBackend *backend = clutter_get_default_backend ();
CoglContext *ctx = clutter_backend_get_cogl_context (backend);
MetaBackgroundImage *image = META_BACKGROUND_IMAGE (source_object); MetaBackgroundImage *image = META_BACKGROUND_IMAGE (source_object);
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
g_autoptr (GError) local_error = NULL; g_autoptr (GError) local_error = NULL;
@ -192,7 +194,7 @@ file_loaded (GObject *source_object,
pixels = gdk_pixbuf_get_pixels (pixbuf); pixels = gdk_pixbuf_get_pixels (pixbuf);
has_alpha = gdk_pixbuf_get_has_alpha (pixbuf); has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
texture = meta_create_texture (width, height, texture = meta_create_texture (width, height, ctx,
has_alpha ? COGL_TEXTURE_COMPONENTS_RGBA : COGL_TEXTURE_COMPONENTS_RGB, has_alpha ? COGL_TEXTURE_COMPONENTS_RGBA : COGL_TEXTURE_COMPONENTS_RGB,
META_TEXTURE_ALLOW_SLICING); META_TEXTURE_ALLOW_SLICING);

3
src/compositor/meta-background.c
View File

@ -671,7 +671,7 @@ ensure_wallpaper_texture (MetaBackground *self,
GError *catch_error = NULL; GError *catch_error = NULL;
CoglPipeline *pipeline; CoglPipeline *pipeline;
self->wallpaper_texture = meta_create_texture (width, height, self->wallpaper_texture = meta_create_texture (width, height, cogl_context,
COGL_TEXTURE_COMPONENTS_RGBA, COGL_TEXTURE_COMPONENTS_RGBA,
META_TEXTURE_FLAGS_NONE); META_TEXTURE_FLAGS_NONE);
offscreen = cogl_offscreen_new_with_texture (self->wallpaper_texture); offscreen = cogl_offscreen_new_with_texture (self->wallpaper_texture);
@ -830,6 +830,7 @@ meta_background_get_texture (MetaBackground *self,
monitor->texture = meta_create_texture (texture_width, monitor->texture = meta_create_texture (texture_width,
texture_height, texture_height,
cogl_context,
COGL_TEXTURE_COMPONENTS_RGBA, COGL_TEXTURE_COMPONENTS_RGBA,
META_TEXTURE_FLAGS_NONE); META_TEXTURE_FLAGS_NONE);
offscreen = cogl_offscreen_new_with_texture (monitor->texture); offscreen = cogl_offscreen_new_with_texture (monitor->texture);