2007-11-08 Rob Bradford <rob@openedhand.com>

	* 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.

diff --git a/ChangeLog b/ChangeLog
index ebb8a0a..a9b0d6f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-08  Rob Bradford  <rob@openedhand.com>
+
+       * 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  <ebassi@openedhand.com>
 
        * clutter/clutter-actor.[ch]: Fix the declaration of the

diff --git a/clutter/cogl/gles/cogl.c b/clutter/cogl/gles/cogl.c
index e6e6880..7a63304 100644 (file)
--- 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