From 14a794f18b8709b9069484966756a445968350df Mon Sep 17 00:00:00 2001 From: Matthew Allum Date: Fri, 24 Aug 2007 15:12:52 +0000 Subject: [PATCH] 2007-08-24 Matthew Allum * clutter/clutter-actor.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-stage.c: * clutter/clutter-stage.h: * clutter/glx/clutter-backend-glx.c: * clutter/glx/clutter-backend-glx.h: * clutter/glx/clutter-event-glx.c: * clutter/glx/clutter-stage-glx.c: * clutter/glx/clutter-stage-glx.h: Add initial support for stage state events. Fix fullscreening for an already mapped stage. * tests/test-events.c: Print out info from the above. Blue button now toggles fullscreen. * clutter/clutter-effect.c: * clutter/clutter-effect.h: Add a setting for templates to ref or clone underlying timelines. (As to improve sync issues like those in foofone) * tests/test-timeline.c: Also add completed signals. * clutter/cogl/gles/cogl.c: (cogl_texture_image_2d): * configure.ac: Forward port from stable branch. RGB Image fixes gles and check for lower case libgles_cm. --- gles/cogl.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gles/cogl.c b/gles/cogl.c index 088c4eb7a..6725975f3 100644 --- a/gles/cogl.c +++ b/gles/cogl.c @@ -374,11 +374,17 @@ cogl_texture_image_2d (COGLenum target, const guchar* pixels) { GE( glTexImage2D (target, - 0, /* No mipmap support as yet */ - internal_format, + 0, + format, /* HACK: For gles we set the internal_format equal + * to the pixel format. This is for RGB data (i.e + * jpgs) which seem to need a matching internal + * format rather than RGBA (which is used by GL) + *. + * This fix isn't ideal.. + */ width, height, - 0, /* 0 pixel border */ + 0, format, type, pixels) );