brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

examples: avoid using the auto-texture apis

Browse Source 
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>

(cherry picked from commit 815a1c80db4132fff6ccf97fc08396e61fc31ebb)

Conflicts:
	examples/cogl-crate.c
	examples/cogl-gles2-context.c
	examples/cogl-msaa.c
This commit is contained in:
Robert Bragg 2013-06-09 01:44:29 +01:00 committed by Neil Roberts
parent 937337993d
commit 5580baeffb
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/cogl-crate.c
View File

@ -220,10 +220,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 (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);

10
examples/cogl-gles2-context.c
View File

@ -95,11 +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 (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);

6
examples/cogl-msaa.c
View File

@ -62,9 +62,9 @@ main (int argc, char **argv)
cogl_onscreen_show (onscreen);
tex = cogl_texture_new_with_size (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);