[mutter/wayland] trivial: shaped-texture: Move set_base_texture to set_cogl_texture



commit 56a0dd6b2cb4c1ec835fc1a4d7c48ad3aa40d666
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Nov 4 21:44:25 2013 -0500

    trivial: shaped-texture: Move set_base_texture to set_cogl_texture
    
    A simple code cleanup.

 src/compositor/meta-shaped-texture.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c
index e47c929..07b58a9 100644
--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.c
@@ -266,6 +266,9 @@ set_cogl_texture (MetaShapedTexture *stex,
    * know how much of the buffer has changed with respect to the
    * previous buffer. We only queue a redraw in response to surface
    * damage. */
+
+  if (priv->create_mipmaps)
+    meta_texture_tower_set_base_texture (priv->paint_tower, cogl_tex);
 }
 
 static void
@@ -872,10 +875,6 @@ meta_shaped_texture_set_pixmap (MetaShapedTexture *stex,
     }
   else
     set_cogl_texture (stex, NULL);
-
-  if (priv->create_mipmaps)
-    meta_texture_tower_set_base_texture (priv->paint_tower,
-                                         COGL_TEXTURE (priv->texture));
 }
 
 void
@@ -899,10 +898,6 @@ meta_shaped_texture_attach_wayland_buffer (MetaShapedTexture  *stex,
     set_cogl_texture (stex, buffer->texture);
   else
     set_cogl_texture (stex, NULL);
-
-  if (priv->create_mipmaps)
-    meta_texture_tower_set_base_texture (priv->paint_tower,
-                                         COGL_TEXTURE (priv->texture));
 }
 
 /**


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