[Cogl] [PATCH 09/11] examples: avoid using the auto-texture apis

Robert Bragg robert at sixbynine.org
Thu Jun 27 09:22:16 PDT 2013


From: Robert Bragg <robert at linux.intel.com>

Instead of using cogl_texture_new_from_file/with_size in the example we
now use the cogl_texture_2d_ equivalents. This is in preparation for
removing the cogl-auto-texture apis.
---
 examples/cogl-crate.c         | 10 +++++-----
 examples/cogl-gles2-context.c | 11 +++++------
 examples/cogl-msaa.c          |  7 +++----
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/examples/cogl-crate.c b/examples/cogl-crate.c
index 806ef43..3caa37c 100644
--- a/examples/cogl-crate.c
+++ b/examples/cogl-crate.c
@@ -222,11 +222,11 @@ main (int argc, char **argv)
 
   /* Load a jpeg crate texture from a file */
   printf ("crate.jpg (CC by-nc-nd http://bit.ly/9kP45T) ShadowRunner27 http://bit.ly/m1YXLh\n");
-  data.texture = cogl_texture_new_from_file (ctx,
-                                             COGL_EXAMPLES_DATA "crate.jpg",
-                                             COGL_TEXTURE_NO_SLICING,
-                                             COGL_PIXEL_FORMAT_ANY,
-                                             &error);
+  data.texture = COGL_TEXTURE (
+    cogl_texture_2d_new_from_file (ctx,
+                                   COGL_EXAMPLES_DATA "crate.jpg",
+                                   COGL_PIXEL_FORMAT_ANY,
+                                   &error));
   if (!data.texture)
     g_error ("Failed to load texture: %s", error->message);
 
diff --git a/examples/cogl-gles2-context.c b/examples/cogl-gles2-context.c
index 73afbbf..8093851 100644
--- a/examples/cogl-gles2-context.c
+++ b/examples/cogl-gles2-context.c
@@ -95,12 +95,11 @@ main (int argc, char **argv)
                                              3, triangle_vertices);
     data.pipeline = cogl_pipeline_new (data.ctx);
 
-    data.offscreen_texture =
-      cogl_texture_new_with_size (data.ctx,
-                                  OFFSCREEN_WIDTH,
-                                  OFFSCREEN_HEIGHT,
-                                  COGL_TEXTURE_NO_SLICING,
-                                  COGL_PIXEL_FORMAT_ANY);
+    data.offscreen_texture = COGL_TEXTURE (
+      cogl_texture_2d_new_with_size (data.ctx,
+                                     OFFSCREEN_WIDTH,
+                                     OFFSCREEN_HEIGHT,
+                                     COGL_PIXEL_FORMAT_ANY));
     data.offscreen = cogl_offscreen_new_to_texture (data.offscreen_texture);
 
     data.gles2_ctx = cogl_gles2_context_new (data.ctx, &error);
diff --git a/examples/cogl-msaa.c b/examples/cogl-msaa.c
index c0d9065..5e13e29 100644
--- a/examples/cogl-msaa.c
+++ b/examples/cogl-msaa.c
@@ -62,10 +62,9 @@ main (int argc, char **argv)
 
     cogl_onscreen_show (onscreen);
 
-    tex = cogl_texture_new_with_size (ctx,
-                                      320, 480,
-                                      COGL_TEXTURE_NO_SLICING,
-                                      COGL_PIXEL_FORMAT_ANY);
+    tex = COGL_TEXTURE (cogl_texture_2d_new_with_size (ctx,
+                                                       320, 480,
+                                                       COGL_PIXEL_FORMAT_ANY));
     offscreen = cogl_offscreen_new_to_texture (tex);
     offscreen_fb = COGL_FRAMEBUFFER (offscreen);
     cogl_framebuffer_set_samples_per_pixel (offscreen_fb, 4);
-- 
1.8.2.1



More information about the Cogl mailing list