[mutter/wip/texture-purge-on-nvidia: 6/6] wip! figure out where to squash these warning fixes



commit e1eabb4fc5b43388bdd9c5488023804ce0e22874
Author: Ray Strode <rstrode redhat com>
Date:   Sun Jan 13 19:44:21 2019 -0500

    wip! figure out where to squash these warning fixes

 src/compositor/meta-shaped-texture.c        | 19 +++++++++----------
 src/compositor/meta-surface-actor-wayland.c |  2 --
 src/wayland/meta-wayland-outputs.c          |  1 -
 3 files changed, 9 insertions(+), 13 deletions(-)
---
diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c
index c5eda31e3..c215d9680 100644
--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.c
@@ -326,7 +326,6 @@ get_base_pipeline (MetaShapedTexture *stex,
 
   if (priv->snippet)
     cogl_pipeline_add_layer_snippet (pipeline, main_layer_index, priv->snippet);
-
   priv->base_pipeline = pipeline;
 
   return priv->base_pipeline;
@@ -1088,15 +1087,15 @@ get_image_via_offscreen (MetaShapedTexture     *stex,
   ClutterBackend *clutter_backend = clutter_get_default_backend ();
   CoglContext *cogl_context =
     clutter_backend_get_cogl_context (clutter_backend);
-  CoglTexture *image_texture;
+  CoglTexture *image_texture = NULL;
   GError *error = NULL;
-  CoglOffscreen *offscreen;
-  CoglFramebuffer *fb;
-  CoglMatrix projection_matrix;
-  unsigned int fb_width, fb_height;
-  cairo_rectangle_int_t fallback_clip;
-  CoglColor clear_color;
-  cairo_surface_t *surface;
+  CoglOffscreen *offscreen = NULL;
+  CoglFramebuffer *fb = NULL;
+  CoglMatrix projection_matrix = { 0 };
+  unsigned int fb_width = 0, fb_height = 0;
+  cairo_rectangle_int_t fallback_clip = { 0 };
+  CoglColor clear_color = { 0 };
+  cairo_surface_t *surface = NULL;
 
   if (cogl_has_feature (cogl_context, COGL_FEATURE_ID_TEXTURE_NPOT))
     {
@@ -1313,7 +1312,7 @@ meta_shaped_texture_get_image (MetaShapedTexture     *stex,
 
 static void
 enable_backing_store (MetaShapedTexture *stex,
-                      CoglTexture       *texture)
+                     CoglTexture       *texture)
 {
   MetaShapedTexturePrivate *priv = stex->priv;
   ClutterBackend *backend = clutter_get_default_backend ();
diff --git a/src/compositor/meta-surface-actor-wayland.c b/src/compositor/meta-surface-actor-wayland.c
index 7b00b68a2..7505b7d79 100644
--- a/src/compositor/meta-surface-actor-wayland.c
+++ b/src/compositor/meta-surface-actor-wayland.c
@@ -228,8 +228,6 @@ meta_surface_actor_wayland_class_init (MetaSurfaceActorWaylandClass *klass)
 static void
 meta_surface_actor_wayland_init (MetaSurfaceActorWayland *self)
 {
-  MetaSurfaceActorWaylandPrivate *priv =
-    meta_surface_actor_wayland_get_instance_private (self);
 }
 
 MetaSurfaceActor *
diff --git a/src/wayland/meta-wayland-outputs.c b/src/wayland/meta-wayland-outputs.c
index 450f5e484..56a8f8b19 100644
--- a/src/wayland/meta-wayland-outputs.c
+++ b/src/wayland/meta-wayland-outputs.c
@@ -515,7 +515,6 @@ static void
 meta_wayland_output_finalize (GObject *object)
 {
   MetaWaylandOutput *wayland_output = META_WAYLAND_OUTPUT (object);
-  GList *l;
 
   wl_global_destroy (wayland_output->global);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]