From 4d4d5a0b160e0f3990ed98a08875e442a4a0f191 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Thu, 18 Apr 2019 16:29:15 -0300 Subject: [PATCH] shell, st: Adjust to CoglPipeline API changes cogl_pipeline_set_layer_null_texture() now doesn't receive the texture type, since it only supports 2D textures now. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/503 --- src/shell-glsl-quad.c | 2 +- src/shell-invert-lightness-effect.c | 4 +--- src/st/st-private.c | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/shell-glsl-quad.c b/src/shell-glsl-quad.c index ba62a98f5..1b543c09a 100644 --- a/src/shell-glsl-quad.c +++ b/src/shell-glsl-quad.c @@ -149,7 +149,7 @@ shell_glsl_quad_constructed (GObject *object) priv->pipeline = cogl_pipeline_copy (klass->base_pipeline); - cogl_pipeline_set_layer_null_texture (priv->pipeline, 0, COGL_TEXTURE_TYPE_2D); + cogl_pipeline_set_layer_null_texture (priv->pipeline, 0); } static void diff --git a/src/shell-invert-lightness-effect.c b/src/shell-invert-lightness-effect.c index 1d4658d8a..b7618dec3 100644 --- a/src/shell-invert-lightness-effect.c +++ b/src/shell-invert-lightness-effect.c @@ -186,9 +186,7 @@ shell_invert_lightness_effect_init (ShellInvertLightnessEffect *self) cogl_pipeline_add_layer_snippet (klass->base_pipeline, 0, snippet); cogl_object_unref (snippet); - cogl_pipeline_set_layer_null_texture (klass->base_pipeline, - 0, /* layer number */ - COGL_TEXTURE_TYPE_2D); + cogl_pipeline_set_layer_null_texture (klass->base_pipeline, 0); } self->pipeline = cogl_pipeline_copy (klass->base_pipeline); diff --git a/src/st/st-private.c b/src/st/st-private.c index 895e33b1e..c5add4b1d 100644 --- a/src/st/st-private.c +++ b/src/st/st-private.c @@ -204,9 +204,7 @@ _st_create_texture_pipeline (CoglTexture *src_texture) clutter_backend_get_cogl_context (clutter_get_default_backend ()); texture_pipeline_template = cogl_pipeline_new (ctx); - cogl_pipeline_set_layer_null_texture (texture_pipeline_template, - 0, /* layer */ - COGL_TEXTURE_TYPE_2D); + cogl_pipeline_set_layer_null_texture (texture_pipeline_template, 0); } pipeline = cogl_pipeline_copy (texture_pipeline_template);