diff options
| author | Robert Bragg <robert@linux.intel.com> | 2013-06-09 01:44:29 +0100 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2013-07-11 21:10:43 +0100 |
| commit | 815a1c80db4132fff6ccf97fc08396e61fc31ebb (patch) | |
| tree | 11a311e8002d2478f802a8ddc5fcc1b47affc4af | |
| parent | 911df79776ce6f695351c15e9872b4f1479d30bf (diff) | |
| download | cogl-815a1c80db4132fff6ccf97fc08396e61fc31ebb.tar.gz | |
examples: avoid using the auto-texture apis
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.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
| -rw-r--r-- | examples/cogl-crate.c | 10 | ||||
| -rw-r--r-- | examples/cogl-gles2-context.c | 11 | ||||
| -rw-r--r-- | 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 806ef43e..3caa37cc 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 73afbbf2..8093851f 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 c0d90652..5e13e293 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); |