Unifies 90% of the code in {gl,gles}/cogl.c in common/cogl.c

This code keeps on diverging and we get bugs and fixes in one version but not the other. This should make things a bit more maintainable.
2025-07-06 10:59:51 +00:00 · 2009-03-30 17:07:31 +01:00
parent 50c1fc6291
commit 8a1b4f8326
6 changed files with 749 additions and 1182 deletions
--- a/clutter/cogl/common/cogl-internal.h
+++ b/clutter/cogl/common/cogl-internal.h
@ -0,0 +1,95 @@
+/*
+ * Cogl
+ *
+ * A basic GL/GLES Abstraction/Utility Layer
+ *
+ * Copyright (C) 2007, 2008 OpenedHand
+ * Copyright (C) 2009 Intel Corp.
+ *
+ * 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.
+ */
+
+#ifndef __COGL_INTERNAL_H
+#define __COGL_INTERNAL_H
+
+#ifdef HAVE_COGL_GLES2
+typedef enum {
+  COGL_BOXED_NONE,
+  COGL_BOXED_INT,
+  COGL_BOXED_FLOAT,
+  COGL_BOXED_MATRIX
+} CoglBoxedType;
+
+typedef struct _CoglBoxedValue
+{
+  CoglBoxedType type;
+  int size, count;
+  gboolean transpose;
+
+  union {
+    gfloat float_value[4];
+    gint int_value[4];
+    gfloat matrix[16];
+    gfloat *float_array;
+    gint *int_array;
+    gpointer array;
+  } v;
+} CoglBoxedValue;
+#endif
+
+#define COGL_DEBUG 0
+
+#if COGL_DEBUG
+
+#include <stdio.h>
+
+const char *_cogl_error_string(GLenum errorCode);
+
+#define GE(x...) G_STMT_START {                                  \
+        GLenum err;                                              \
+        (x);                                                     \
+        while ((err = glGetError()) != GL_NO_ERROR) {            \
+                fprintf(stderr, "glError: %s caught at %s:%u\n", \
+			(char *)_cogl_error_string(err),	 \
+			__FILE__, __LINE__);			 \
+        }                                                        \
+} G_STMT_END
+
+#else /* COGL_DEBUG */
+
+#define GE(x) (x)
+
+#endif /* COGL_DEBUG */
+
+#define COGL_ENABLE_BLEND             (1<<1)
+#define COGL_ENABLE_ALPHA_TEST        (1<<2)
+#define COGL_ENABLE_VERTEX_ARRAY      (1<<3)
+#define COGL_ENABLE_COLOR_ARRAY       (1<<4)
+#define COGL_ENABLE_BACKFACE_CULLING  (1<<5)
+
+void
+_cogl_features_init (void);
+
+gint
+_cogl_get_format_bpp (CoglPixelFormat format);
+
+void
+cogl_enable (gulong flags);
+
+gulong
+cogl_get_enable ();
+
+#endif /* __COGL_INTERNAL_H */