diff --git a/clutter/cogl/gl/Makefile.am b/clutter/cogl/gl/Makefile.am index 0e251f457..26fadc42c 100644 --- a/clutter/cogl/gl/Makefile.am +++ b/clutter/cogl/gl/Makefile.am @@ -18,7 +18,6 @@ cogl_headers = \ $(NULL) cogl_priv_headers = \ - cogl-internal.h \ cogl-texture-private.h \ cogl-fbo.h \ cogl-shader-private.h \ diff --git a/clutter/cogl/gl/cogl-internal.h b/clutter/cogl/gl/cogl-internal.h deleted file mode 100644 index 0e83e7a52..000000000 --- a/clutter/cogl/gl/cogl-internal.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Cogl - * - * An object oriented GL/GLES Abstraction/Utility Layer - * - * Copyright (C) 2007,2008,2009 Intel Corporation. - * - * 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 - -#define COGL_DEBUG 0 - -#if COGL_DEBUG - -#include - -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) - -gint -_cogl_get_format_bpp (CoglPixelFormat format); - -void -cogl_enable (gulong flags); - -gulong -cogl_get_enable (); - -#endif /* __COGL_INTERNAL_H */ diff --git a/clutter/cogl/gles/Makefile.am b/clutter/cogl/gles/Makefile.am index 5a2b8e429..abebf7275 100644 --- a/clutter/cogl/gles/Makefile.am +++ b/clutter/cogl/gles/Makefile.am @@ -45,7 +45,6 @@ libclutter_cogl_la_SOURCES = \ $(top_builddir)/clutter/cogl/cogl-texture.h \ $(top_builddir)/clutter/cogl/cogl-types.h \ $(top_builddir)/clutter/cogl/cogl-debug.h \ - cogl-internal.h \ cogl-texture-private.h \ cogl-fbo.h \ cogl-context.h \ diff --git a/clutter/cogl/gles/cogl-internal.h b/clutter/cogl/gles/cogl-internal.h deleted file mode 100644 index 6ca9c7a82..000000000 --- a/clutter/cogl/gles/cogl-internal.h +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Cogl - * - * An object oriented GL/GLES Abstraction/Utility Layer - * - * Copyright (C) 2007,2008,2009 Intel Corporation. - * - * 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 - -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; - - -#define COGL_DEBUG 0 - -#if COGL_DEBUG - -#include - -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 */