2007-03-27 Matthew Allum <mallum@openedhand.com>

* clutter/cogl/Makefile.am:
        * clutter/cogl/cogl.h:
        * clutter/cogl/gles/Makefile.am:
        * clutter/cogl/gles/cogl.c:
        Begin poplulating cogl GLES code.

        * configure.ac:
        * clutter/egl/clutter-event-egl.c:
        * clutter/egl/clutter-stage-egl.c:
        * clutter/egl/clutter-stage-egl.h:
        * clutter/egl/clutter-backend-egl.c:
        * clutter/egl/clutter-backend-egl.h:
        * clutter/egl/clutter-egl.h:
        Add initial EGL/X backend work mostly ported from backend branch.
        Builds but untested as yet.

        * clutter/glx/clutter-stage-glx.c:
        Only include XFixes Header if we have have it.

        * clutter/clutter-behaviour.c: (clutter_behaviour_apply):
        * clutter/clutter-behaviour.h:
        Add clutter_behaviour_is_applied()

Makefile.am

@@ -1,3 +1,5 @@
-SUBDIRS=gl
+SUBDIRS = $(CLUTTER_COGL) 
 
-EXTRA_DIST=cogl.h
+EXTRA_DIST=cogl.h
+
+DIST_SUBDIRS = gl gles

cogl.h

@@ -63,6 +63,34 @@ cogl_rotatex (ClutterFixed angle, gint x, gint y, gint z);
 void
 cogl_rotate (gint angle, gint x, gint y, gint z);
 
+void
+cogl_color (ClutterColor *color);
+
+#if 0
+
+../clutter/.libs/libclutter-egl-0.3.so: undefined reference to `glColor3f'
+../clutter/.libs/libclutter-egl-0.3.so: undefined reference to `glColor4ub'
+../clutter/.libs/libclutter-egl-0.3.so: undefined reference to `glGetTexLevelParameteriv'
+../clutter/.libs/libclutter-egl-0.3.so: undefined reference to `glSelectBuffer'
+../clutter/.libs/libclutter-egl-0.3.so: undefined reference to `glScaled'
+../clutter/.libs/libclutter-egl-0.3.so: undefined reference to `glPushName'
+../clutter/.libs/libclutter-egl-0.3.so: undefined reference to `glRecti'
+../clutter/.libs/libclutter-egl-0.3.so: undefined reference to `glBegin'
+../clutter/.libs/libclutter-egl-0.3.so: undefined reference to `glInitNames'
+../clutter/.libs/libclutter-egl-0.3.so: undefined reference to `glVertex2i'
+../clutter/.libs/libclutter-egl-0.3.so: undefined reference to `glGetTexImage'
+../clutter/.libs/libclutter-egl-0.3.so: undefined reference to `glTexCoord2f'
+../clutter/.libs/libclutter-egl-0.3.so: undefined reference to `glRenderMode'
+../clutter/.libs/libclutter-egl-0.3.so: undefined reference to `glTranslated'
+../clutter/.libs/libclutter-egl-0.3.so: undefined reference to `glRotated'
+../clutter/.libs/libclutter-egl-0.3.so: undefined reference to `glLoadName'
+../clutter/.libs/libclutter-egl-0.3.so: undefined reference to `glTexEnvi'
+../clutter/.libs/libclutter-egl-0.3.so: undefined reference to `glVertex2d'
+../clutter/.libs/libclutter-egl-0.3.so: undefined reference to `glEnd'
+
+#endif
+
 G_END_DECLS
 
 #endif /* __COGL_H__ */
+

gles/Makefile.am

@@ -0,0 +1,17 @@
+libclutterincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/clutter
+libclutterinclude_HEADERS = $(top_srcdir)/clutter/cogl/cogl.h
+
+INCLUDES = \
+	-I$(top_srcdir)              \
+	-I$(top_srcdir)/clutter/cogl \
+	$(CLUTTER_CFLAGS)            \
+	$(CLUTTER_DEBUG_CFLAGS)      \
+	$(GCC_FLAGS)
+
+LDADD = $(CLUTTER_LIBS)
+
+noinst_LTLIBRARIES = libclutter-cogl.la
+
+libclutter_cogl_la_SOURCES =               \
+	$(top_srcdir)/clutter/cogl/cogl.h  \
+	cogl.c

gles/cogl.c

@@ -0,0 +1,103 @@
+/*
+ * Clutter COGL
+ *
+ * A basic GL/GLES Abstraction/Utility Layer
+ *
+ * Authored By Matthew Allum  <mallum@openedhand.com>
+ *
+ * Copyright (C) 2007 OpenedHand
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "cogl.h"
+#include <GLES/gl.h>
+
+CoglFuncPtr
+cogl_get_proc_address (const gchar* name)
+{
+  return NULL;
+}
+
+gboolean 
+cogl_check_extension (const gchar *name, const gchar *ext)
+{
+  return FALSE;
+}
+
+void
+cogl_paint_init (ClutterColor *color)
+{
+  glClearColorx ((color->red << 16) / 0xff, 
+		 (color->green << 16) / 0xff,
+		 (color->blue << 16) / 0xff, 
+		 0xff);
+
+  glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+  glDisable (GL_LIGHTING); 
+  glDisable (GL_DEPTH_TEST);
+}
+
+/* FIXME: inline most of these  */
+void
+cogl_push_matrix (void)
+{
+  glPushMatrix();
+}
+
+void
+cogl_pop_matrix (void)
+{
+  glPopMatrix();
+}
+
+void
+cogl_scaled (ClutterFixed x, ClutterFixed y)
+{
+  glScalex (x, y, CFX_ONE); 
+}
+
+void
+cogl_translatex (ClutterFixed x, ClutterFixed y, ClutterFixed z)
+{
+  glTranslatex (x, y, z);
+}
+
+void
+cogl_translate (gint x, gint y, gint z)
+{
+  glTranslatex (CLUTTER_INT_TO_FIXED(x), 
+		CLUTTER_INT_TO_FIXED(y), 
+		CLUTTER_INT_TO_FIXED(z));
+}
+
+void
+cogl_rotatex (ClutterFixed angle, 
+	      ClutterFixed x, 
+	      ClutterFixed y, 
+	      ClutterFixed z)
+{
+  glRotatex (angle,x,y,z);
+}
+
+void
+cogl_rotate (gint angle, gint x, gint y, gint z)
+{
+  glRotatef (CLUTTER_INT_TO_FIXED(angle),
+	     CLUTTER_INT_TO_FIXED(x), 
+	     CLUTTER_INT_TO_FIXED(y), 
+	     CLUTTER_INT_TO_FIXED(z));
+}