From 6997c45f842e24e7e8793e1595b02f965a64d867 Mon Sep 17 00:00:00 2001 From: Robert Bradford Date: Thu, 8 Nov 2007 21:23:53 +0000 Subject: [PATCH] 2007-11-08 Rob Bradford * clutter/cogl/gles/cogl.c: (cogl_color): Switch over to using glColor4ub in the GLES backend. It's available in the header file but missing in the reference manual. --- ChangeLog | 6 ++++++ clutter/cogl/gles/cogl.c | 14 ++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ebb8a0a9d..a9b0d6f9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-11-08 Rob Bradford + + * clutter/cogl/gles/cogl.c: (cogl_color): + Switch over to using glColor4ub in the GLES backend. It's available in + the header file but missing in the reference manual. + 2007-11-07 Emmanuele Bassi * clutter/clutter-actor.[ch]: Fix the declaration of the diff --git a/clutter/cogl/gles/cogl.c b/clutter/cogl/gles/cogl.c index e6e688089..7a63304eb 100644 --- a/clutter/cogl/gles/cogl.c +++ b/clutter/cogl/gles/cogl.c @@ -239,10 +239,16 @@ cogl_enable (gulong flags) void cogl_color (const ClutterColor *color) { - GE( glColor4x ((color->red << 16) / 0xff, - (color->green << 16) / 0xff, - (color->blue << 16) / 0xff, - (color->alpha << 16) / 0xff) ); + /* + * GLES 1.1 does actually have this function, it's in the header file but + * missing in the reference manual: + * + * http://www.khronos.org/egl/headers/1_1/gl.h + */ + GE( glColor4ub (color->red, + color->green, + color->blue, + color->alpha) ); } void