2008-04-14 Matthew Allum <mallum@openedhand.com>

* clutter/cogl/gles/cogl.c: (cogl_color):
        Disable use of color4ub, issues with latest MBX SDL (#857)

        * clutter/eglx/clutter-backend-egl.c:
        * clutter/eglx/clutter-stage-egl.c:
        * configure.ac:
        Fixup for the eglx backend to work with new backend/multistage code.
        Some issues remain in destroying stages.
This commit is contained in:
Matthew Allum 2008-04-14 15:10:22 +00:00
parent 0d6530e434
commit b70bf89ced

View File

@ -242,7 +242,12 @@ cogl_enable_depth_test (gboolean setting)
void void
cogl_color (const ClutterColor *color) cogl_color (const ClutterColor *color)
{ {
#if HAVE_GLES_COLOR4UB #if 0 /*HAVE_GLES_COLOR4UB*/
/* NOTE: seems SDK_OGLES-1.1_LINUX_PCEMULATION_2.02.22.0756 has this call
* but is broken - see #857. Therefor disabling.
*/
/* /*
* GLES 1.1 does actually have this function, it's in the header file but * GLES 1.1 does actually have this function, it's in the header file but
* missing in the reference manual (and SDK): * missing in the reference manual (and SDK):
@ -253,6 +258,8 @@ cogl_color (const ClutterColor *color)
color->green, color->green,
color->blue, color->blue,
color->alpha) ); color->alpha) );
#else #else
/* conversion can cause issues with picking on some gles implementations */ /* conversion can cause issues with picking on some gles implementations */
GE( glColor4x ((color->red << 16) / 0xff, GE( glColor4x ((color->red << 16) / 0xff,