sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

2007-11-15 Matthew Allum <mallum@openedhand.com>

Browse source 
* clutter/Makefile.am:
        * clutter/eglx/Makefile.am:
        * clutter/eglx/clutter-backend-egl.c:
        * clutter/eglx/clutter-backend-egl.h:
        * clutter/eglx/clutter-eglx.h:
        * clutter/eglx/clutter-event-egl.c:
        * clutter/eglx/clutter-stage-egl.c:
        * clutter/eglx/clutter-stage-egl.h:
        * clutter/glx/Makefile.am:
        * clutter/glx/clutter-backend-glx.c:
        * clutter/glx/clutter-backend-glx.h:
        * clutter/glx/clutter-event-glx.c:
        * clutter/glx/clutter-glx.h:
        * clutter/glx/clutter-stage-glx.c:
        * clutter/glx/clutter-stage-glx.h:
        * clutter/x11/Makefile.am:
        * clutter/x11/clutter-backend-x11-private.h:
        * clutter/x11/clutter-backend-x11.c:
        * clutter/x11/clutter-backend-x11.h:
        * clutter/x11/clutter-event-x11.c:
        * clutter/x11/clutter-stage-x11.c:
        * clutter/x11/clutter-stage-x11.h:
        * clutter/x11/clutter-x11.h:
        Create a new X11 backend class of which EGL and GLX 'real' backends
        then subclass. Effectively shares all X11 code between both backends
        avoids code duplication and brings many missing features to EGL X
        backend. Requires some cleanup and testing. (#518)

        * clutter/cogl/gles/cogl.c: (cogl_color):
        Add define to use color4ub only if configure finds it.
        If not fall back to old code.

        * configure.ac:
        Drop support for vincent checks.
        Drop sdles backend.
        Specifically check for color4ub call.
This commit is contained in:
Matthew Allum 2007-11-15 14:45:27 +00:00
parent 72d39f309e
commit 2331fa7557
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gles/cogl.c
View file

@ -239,9 +239,10 @@ cogl_enable (gulong flags)
void void
cogl_color (const ClutterColor *color) cogl_color (const ClutterColor *color)
{ {
#if HAVE_GLES_COLOR4UB
/* /*
* 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: * missing in the reference manual (and SDK):
* *
* http://www.khronos.org/egl/headers/1_1/gl.h * http://www.khronos.org/egl/headers/1_1/gl.h
*/ */
@ -249,6 +250,13 @@ cogl_color (const ClutterColor *color)
color->green, color->green,
color->blue, color->blue,
color->alpha) ); color->alpha) );
#else
/* conversion can cause issues with picking on some gles implementations */
GE( glColor4x ((color->red << 16) / 0xff,
(color->green << 16) / 0xff,
(color->blue << 16) / 0xff,
(color->alpha << 16) / 0xff));
#endif
} }
void void