brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove cogl-internal.h

Browse Source 
This remove cogl-internal.h in favour of using cogl-private.h. Some
things in cogl-internal.h were moved to driver/gl/cogl-util-gl-private.h
and the _cogl_gl_error_to_string function whose prototype was moved from
cogl-internal.h to cogl-util-gl-private.h has had its implementation
moved from cogl.c to cogl-util-gl.c

Reviewed-by: Neil Roberts <neil@linux.intel.com>

(cherry picked from commit 01cc82ece091aa3bec4c07fdd6bc9e5135fca573)
This commit is contained in:
Robert Bragg 2013-01-20 18:47:40 +00:00
parent db4b39b5ad
commit 36c85da3b8
57 changed files with 155 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cogl/Makefile.am
View File

@ -272,7 +272,6 @@ cogl_sources_c = \
$(srcdir)/cogl-display-private.h \
$(srcdir)/cogl-display.h \
$(srcdir)/cogl-display.c \
$(srcdir)/cogl-internal.h \
$(srcdir)/cogl-driver.h \
$(srcdir)/cogl.c \
$(srcdir)/cogl-object-private.h \

1
cogl/cogl-atlas-texture.c
View File

@ -29,7 +29,6 @@
#endif
#include "cogl-debug.h"
#include "cogl-internal.h"
#include "cogl-util.h"
#include "cogl-texture-private.h"
#include "cogl-atlas-texture-private.h"

1
cogl/cogl-bitmap-pixbuf.c
View File

@ -26,7 +26,6 @@
#endif
#include "cogl-util.h"
#include "cogl-internal.h"
#include "cogl-bitmap-private.h"
#include "cogl-context-private.h"
#include "cogl-private.h"

1
cogl/cogl-blend-string.c
View File

@ -33,7 +33,6 @@
#include <glib.h>
#include "cogl-internal.h"
#include "cogl-context-private.h"
#include "cogl-debug.h"
#include "cogl-blend-string.h"

1
cogl/cogl-boxed-value.c
View File

@ -29,6 +29,7 @@
#include "cogl-boxed-value.h"
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
CoglBool
_cogl_boxed_value_equal (const CoglBoxedValue *bva,

1
cogl/cogl-buffer.c
View File

@ -38,7 +38,6 @@
#include <string.h>
#include <glib.h>
#include "cogl-internal.h"
#include "cogl-util.h"
#include "cogl-context-private.h"
#include "cogl-object-private.h"

1
cogl/cogl-clip-stack.c
View File

@ -34,7 +34,6 @@
#include "cogl-clip-stack.h"
#include "cogl-primitives.h"
#include "cogl-context-private.h"
#include "cogl-internal.h"
#include "cogl-framebuffer-private.h"
#include "cogl-journal-private.h"
#include "cogl-util.h"

1
cogl/cogl-clip-state.c
View File

@ -33,7 +33,6 @@
#include "cogl-clip-stack.h"
#include "cogl-clip-state-private.h"
#include "cogl-context-private.h"
#include "cogl-internal.h"
#include "cogl-framebuffer-private.h"
#include "cogl-journal-private.h"
#include "cogl-util.h"

1
cogl/cogl-context-private.h
View File

@ -24,7 +24,6 @@
#ifndef __COGL_CONTEXT_PRIVATE_H
#define __COGL_CONTEXT_PRIVATE_H
#include "cogl-internal.h"
#include "cogl-context.h"
#include "cogl-winsys-private.h"
#include "cogl-flags.h"

2
cogl/cogl-context.c
View File

@ -26,13 +26,13 @@
#endif
#include "cogl-object.h"
#include "cogl-internal.h"
#include "cogl-private.h"
#include "cogl-winsys-private.h"
#include "winsys/cogl-winsys-stub-private.h"
#include "cogl-profile.h"
#include "cogl-util.h"
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-display-private.h"
#include "cogl-renderer-private.h"
#include "cogl-journal-private.h"

1
cogl/cogl-display-private.h
View File

@ -29,7 +29,6 @@
#include "cogl-display.h"
#include "cogl-renderer.h"
#include "cogl-onscreen-template.h"
#include "cogl-internal.h"
#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
#include <wayland-server.h>
#endif

1
cogl/cogl-display.c
View File

@ -32,7 +32,6 @@
#include "cogl-private.h"
#include "cogl-object.h"
#include "cogl-internal.h"
#include "cogl-display-private.h"
#include "cogl-renderer-private.h"

12
cogl/cogl-driver.h
View File

@ -267,5 +267,17 @@ struct _CoglDriverVtable
CoglError **error);
};
#define COGL_DRIVER_ERROR (_cogl_driver_error_quark ())
typedef enum { /*< prefix=COGL_DRIVER_ERROR >*/
COGL_DRIVER_ERROR_UNKNOWN_VERSION,
COGL_DRIVER_ERROR_INVALID_VERSION,
COGL_DRIVER_ERROR_NO_SUITABLE_DRIVER_FOUND,
COGL_DRIVER_ERROR_FAILED_TO_LOAD_LIBRARY
} CoglDriverError;
uint32_t
_cogl_driver_error_quark (void);
#endif /* __COGL_DRIVER_H */

1
cogl/cogl-feature-private.h
View File

@ -26,7 +26,6 @@
#include <glib.h>
#include "cogl-internal.h"
#define COGL_CHECK_GL_VERSION(driver_major, driver_minor, \
target_major, target_minor) \

2
cogl/cogl-framebuffer.c
View File

@ -29,8 +29,8 @@
#include <string.h>
#include "cogl-debug.h"
#include "cogl-internal.h"
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-display-private.h"
#include "cogl-renderer-private.h"
#include "cogl-object-private.h"

2
cogl/cogl-glsl-shader.c
View File

@ -31,9 +31,9 @@
#endif
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-glsl-shader-private.h"
#include "cogl-glsl-shader-boilerplate.h"
#include "cogl-internal.h"
#include <string.h>

133
cogl/cogl-internal.h
View File

@ -1,133 +0,0 @@
/*
* Cogl
*
* An object oriented GL/GLES Abstraction/Utility Layer
*
* Copyright (C) 2007,2008,2009,2010 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, see <http://www.gnu.org/licenses/>.
*
*
*/
#ifndef __COGL_INTERNAL_H
#define __COGL_INTERNAL_H
#include "cogl-bitmask.h"
#include "cogl-gl-header.h"
#ifdef COGL_HAS_XLIB_SUPPORT
#include <X11/Xutil.h>
#endif
#ifdef COGL_GL_DEBUG
const char *
_cogl_gl_error_to_string (GLenum error_code);
#define GE(ctx, x) G_STMT_START { \
GLenum __err; \
(ctx)->x; \
while ((__err = (ctx)->glGetError ()) != GL_NO_ERROR) \
{ \
g_warning ("%s: GL error (%d): %s\n", \
G_STRLOC, \
__err, \
_cogl_gl_error_to_string (__err)); \
} } G_STMT_END
#define GE_RET(ret, ctx, x) G_STMT_START { \
GLenum __err; \
ret = (ctx)->x; \
while ((__err = (ctx)->glGetError ()) != GL_NO_ERROR) \
{ \
g_warning ("%s: GL error (%d): %s\n", \
G_STRLOC, \
__err, \
_cogl_gl_error_to_string (__err)); \
} } G_STMT_END
#else /* !COGL_GL_DEBUG */
#define GE(ctx, x) ((ctx)->x)
#define GE_RET(ret, ctx, x) (ret = ((ctx)->x))
#endif /* COGL_GL_DEBUG */
#define COGL_ENABLE_ALPHA_TEST (1<<1)
#define COGL_ENABLE_VERTEX_ARRAY (1<<2)
#define COGL_ENABLE_COLOR_ARRAY (1<<3)
void
_cogl_enable (unsigned long flags);
unsigned long
_cogl_get_enable (void);
void
_cogl_transform_point (const CoglMatrix *matrix_mv,
const CoglMatrix *matrix_p,
const float *viewport,
float *x,
float *y);
#define COGL_DRIVER_ERROR (_cogl_driver_error_quark ())
typedef enum { /*< prefix=COGL_DRIVER_ERROR >*/
COGL_DRIVER_ERROR_UNKNOWN_VERSION,
COGL_DRIVER_ERROR_INVALID_VERSION,
COGL_DRIVER_ERROR_NO_SUITABLE_DRIVER_FOUND,
COGL_DRIVER_ERROR_FAILED_TO_LOAD_LIBRARY
} CoglDriverError;
typedef enum
{
COGL_PRIVATE_FEATURE_TEXTURE_2D_FROM_EGL_IMAGE = 1L<<0,
COGL_PRIVATE_FEATURE_MESA_PACK_INVERT = 1L<<1,
COGL_PRIVATE_FEATURE_STENCIL_BUFFER = 1L<<2,
COGL_PRIVATE_FEATURE_OFFSCREEN_BLIT = 1L<<3,
COGL_PRIVATE_FEATURE_FOUR_CLIP_PLANES = 1L<<4,
COGL_PRIVATE_FEATURE_PBOS = 1L<<5,
COGL_PRIVATE_FEATURE_VBOS = 1L<<6,
COGL_PRIVATE_FEATURE_EXT_PACKED_DEPTH_STENCIL = 1L<<7,
COGL_PRIVATE_FEATURE_OES_PACKED_DEPTH_STENCIL = 1L<<8,
COGL_PRIVATE_FEATURE_TEXTURE_FORMAT_BGRA8888 = 1L<<9,
COGL_PRIVATE_FEATURE_UNPACK_SUBIMAGE = 1L<<10,
COGL_PRIVATE_FEATURE_SAMPLER_OBJECTS = 1L<<11,
COGL_PRIVATE_FEATURE_FIXED_FUNCTION = 1L<<12,
COGL_PRIVATE_FEATURE_READ_PIXELS_ANY_FORMAT = 1L<<13,
COGL_PRIVATE_FEATURE_ANY_GL = 1L<<14,
COGL_PRIVATE_FEATURE_ALPHA_TEST = 1L<<15,
COGL_PRIVATE_FEATURE_FORMAT_CONVERSION = 1L<<16,
COGL_PRIVATE_FEATURE_QUADS = 1L<<17,
COGL_PRIVATE_FEATURE_BLEND_CONSTANT = 1L<<18,
COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS = 1L<<19,
COGL_PRIVATE_FEATURE_BUILTIN_POINT_SIZE_UNIFORM = 1L<<20,
COGL_PRIVATE_FEATURE_QUERY_TEXTURE_PARAMETERS = 1L<<21,
COGL_PRIVATE_FEATURE_ALPHA_TEXTURES = 1L<<22,
COGL_PRIVATE_FEATURE_TEXTURE_SWIZZLE = 1L<<23
} CoglPrivateFeatureFlags;
/* Sometimes when evaluating pipelines, either during comparisons or
* if calculating a hash value we need to tweak the evaluation
* semantics */
typedef enum _CoglPipelineEvalFlags
{
COGL_PIPELINE_EVAL_FLAG_NONE = 0
} CoglPipelineEvalFlags;
uint32_t
_cogl_driver_error_quark (void);
#endif /* __COGL_INTERNAL_H */

1
cogl/cogl-journal.c
View File

@ -26,7 +26,6 @@
#endif
#include "cogl-debug.h"
#include "cogl-internal.h"
#include "cogl-context-private.h"
#include "cogl-journal-private.h"
#include "cogl-texture-private.h"

2
cogl/cogl-matrix-stack.c
View File

@ -30,7 +30,7 @@
#endif
#include "cogl-context-private.h"
#include "cogl-internal.h"
#include "cogl-util-gl-private.h"
#include "cogl-matrix-stack.h"
#include "cogl-framebuffer-private.h"
#include "cogl-object-private.h"

2
cogl/cogl-path.c
View File

@ -28,7 +28,7 @@
#endif
#include "cogl-util.h"
#include "cogl-internal.h"
#include "cogl-object.h"
#include "cogl-context-private.h"
#include "cogl2-path.h"

2
cogl/cogl-pipeline-layer-private.h
View File

@ -28,12 +28,12 @@
#ifndef __COGL_PIPELINE_LAYER_PRIVATE_H
#define __COGL_PIPELINE_LAYER_PRIVATE_H
#include "cogl-private.h"
#include "cogl-pipeline.h"
#include "cogl-node-private.h"
#include "cogl-texture.h"
#include "cogl-matrix.h"
#include "cogl-pipeline-layer-state.h"
#include "cogl-internal.h"
#include "cogl-pipeline-snippet-private.h"
#include "cogl-sampler-cache-private.h"

2
cogl/cogl-pipeline-private.h
View File

@ -35,11 +35,11 @@
#include "cogl-object-private.h"
#include "cogl-profile.h"
#include "cogl-queue.h"
#include "cogl-internal.h"
#include "cogl-boxed-value.h"
#include "cogl-pipeline-snippet-private.h"
#include "cogl-pipeline-state.h"
#include "cogl-framebuffer.h"
#include "cogl-bitmask.h"
#include <glib.h>

1
cogl/cogl-pipeline.c
View File

@ -30,7 +30,6 @@
#endif
#include "cogl-debug.h"
#include "cogl-internal.h"
#include "cogl-context-private.h"
#include "cogl-object.h"

1
cogl/cogl-primitives.c
View File

@ -26,7 +26,6 @@
#endif
#include "cogl-debug.h"
#include "cogl-internal.h"
#include "cogl-context-private.h"
#include "cogl-journal-private.h"
#include "cogl-texture-private.h"

44
cogl/cogl-private.h
View File

@ -28,8 +28,52 @@
#include "cogl-context.h"
COGL_BEGIN_DECLS
typedef enum
{
COGL_PRIVATE_FEATURE_TEXTURE_2D_FROM_EGL_IMAGE = 1L<<0,
COGL_PRIVATE_FEATURE_MESA_PACK_INVERT = 1L<<1,
COGL_PRIVATE_FEATURE_STENCIL_BUFFER = 1L<<2,
COGL_PRIVATE_FEATURE_OFFSCREEN_BLIT = 1L<<3,
COGL_PRIVATE_FEATURE_FOUR_CLIP_PLANES = 1L<<4,
COGL_PRIVATE_FEATURE_PBOS = 1L<<5,
COGL_PRIVATE_FEATURE_VBOS = 1L<<6,
COGL_PRIVATE_FEATURE_EXT_PACKED_DEPTH_STENCIL = 1L<<7,
COGL_PRIVATE_FEATURE_OES_PACKED_DEPTH_STENCIL = 1L<<8,
COGL_PRIVATE_FEATURE_TEXTURE_FORMAT_BGRA8888 = 1L<<9,
COGL_PRIVATE_FEATURE_UNPACK_SUBIMAGE = 1L<<10,
COGL_PRIVATE_FEATURE_SAMPLER_OBJECTS = 1L<<11,
COGL_PRIVATE_FEATURE_FIXED_FUNCTION = 1L<<12,
COGL_PRIVATE_FEATURE_READ_PIXELS_ANY_FORMAT = 1L<<13,
COGL_PRIVATE_FEATURE_ANY_GL = 1L<<14,
COGL_PRIVATE_FEATURE_ALPHA_TEST = 1L<<15,
COGL_PRIVATE_FEATURE_FORMAT_CONVERSION = 1L<<16,
COGL_PRIVATE_FEATURE_QUADS = 1L<<17,
COGL_PRIVATE_FEATURE_BLEND_CONSTANT = 1L<<18,
COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS = 1L<<19,
COGL_PRIVATE_FEATURE_BUILTIN_POINT_SIZE_UNIFORM = 1L<<20,
COGL_PRIVATE_FEATURE_QUERY_TEXTURE_PARAMETERS = 1L<<21,
COGL_PRIVATE_FEATURE_ALPHA_TEXTURES = 1L<<22,
COGL_PRIVATE_FEATURE_TEXTURE_SWIZZLE = 1L<<23
} CoglPrivateFeatureFlags;
/* Sometimes when evaluating pipelines, either during comparisons or
* if calculating a hash value we need to tweak the evaluation
* semantics */
typedef enum _CoglPipelineEvalFlags
{
COGL_PIPELINE_EVAL_FLAG_NONE = 0
} CoglPipelineEvalFlags;
void
_cogl_transform_point (const CoglMatrix *matrix_mv,
const CoglMatrix *matrix_p,
const float *viewport,
float *x,
float *y);
CoglBool
_cogl_check_extension (const char *name, char * const *ext);

1
cogl/cogl-program-private.h
View File

@ -25,7 +25,6 @@
#define __COGL_PROGRAM_H
#include "cogl-object-private.h"
#include "cogl-internal.h"
#include "cogl-shader-private.h"
typedef struct _CoglProgram CoglProgram;

2
cogl/cogl-program.c
View File

@ -27,7 +27,7 @@
#include "cogl-util.h"
#include "cogl-internal.h"
#include "cogl-util-gl-private.h"
#include "cogl-context-private.h"
#include "cogl-object-private.h"

1
cogl/cogl-renderer-private.h
View File

@ -28,7 +28,6 @@
#include "cogl-object-private.h"
#include "cogl-winsys-private.h"
#include "cogl-internal.h"
#include "cogl-driver.h"
#include "cogl-texture-driver.h"

2
cogl/cogl-renderer.c
View File

@ -32,10 +32,10 @@
#include <string.h>
#include "cogl-util.h"
#include "cogl-internal.h"
#include "cogl-private.h"
#include "cogl-object.h"
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-renderer.h"
#include "cogl-renderer-private.h"

1
cogl/cogl-sampler-cache.c
View File

@ -30,6 +30,7 @@
#include "cogl-sampler-cache-private.h"
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#ifndef GL_TEXTURE_WRAP_R
#define GL_TEXTURE_WRAP_R 0x8072

2
cogl/cogl-shader.c
View File

@ -26,7 +26,7 @@
#endif
#include "cogl-shader-private.h"
#include "cogl-internal.h"
#include "cogl-util-gl-private.h"
#include "cogl-context-private.h"
#include "cogl-object-private.h"
#include "cogl-glsl-shader-private.h"

1
cogl/cogl-spans.c
View File

@ -28,7 +28,6 @@
#include "math.h"
#include "cogl-util.h"
#include "cogl-internal.h"
#include "cogl-spans.h"
void

1
cogl/cogl-sub-texture.c
View File

@ -28,7 +28,6 @@
#include "config.h"
#endif
#include "cogl-internal.h"
#include "cogl-util.h"
#include "cogl-texture-private.h"
#include "cogl-sub-texture-private.h"

1
cogl/cogl-texture.c
View File

@ -31,7 +31,6 @@
#include "config.h"
#endif
#include "cogl-internal.h"
#include "cogl-util.h"
#include "cogl-bitmap.h"
#include "cogl-bitmap-private.h"

1
cogl/cogl-vertex-buffer.c
View File

@ -96,7 +96,6 @@
#include <string.h>
#include <glib.h>
#include "cogl-internal.h"
#include "cogl-util.h"
#include "cogl-context-private.h"
#include "cogl-object-private.h"

1
cogl/cogl-xlib-renderer.c
View File

@ -30,7 +30,6 @@
#include "cogl-xlib-renderer.h"
#include "cogl-util.h"
#include "cogl-internal.h"
#include "cogl-object.h"
#include "cogl-renderer-private.h"

1
cogl/cogl-xlib.c
View File

@ -31,7 +31,6 @@
#include <cogl-xlib.h>
#include <cogl-internal.h>
#include <cogl-object-private.h>
#include <cogl-context-private.h>
#include <cogl-framebuffer-private.h>

39
cogl/cogl.c
View File

@ -31,7 +31,6 @@
#include <glib/gi18n-lib.h>
#include "cogl-debug.h"
#include "cogl-internal.h"
#include "cogl-util.h"
#include "cogl-context-private.h"
#include "cogl-pipeline-private.h"
@ -53,44 +52,6 @@
#include "cogl-attribute-gl-private.h"
#include "cogl-clutter.h"
#ifdef COGL_GL_DEBUG
/* GL error to string conversion */
static const struct {
GLuint error_code;
const char *error_string;
} gl_errors[] = {
{ GL_NO_ERROR, "No error" },
{ GL_INVALID_ENUM, "Invalid enumeration value" },
{ GL_INVALID_VALUE, "Invalid value" },
{ GL_INVALID_OPERATION, "Invalid operation" },
#ifdef HAVE_COGL_GL
{ GL_STACK_OVERFLOW, "Stack overflow" },
{ GL_STACK_UNDERFLOW, "Stack underflow" },
#endif
{ GL_OUT_OF_MEMORY, "Out of memory" },
#ifdef GL_INVALID_FRAMEBUFFER_OPERATION_EXT
{ GL_INVALID_FRAMEBUFFER_OPERATION_EXT, "Invalid framebuffer operation" }
#endif
};
static const unsigned int n_gl_errors = G_N_ELEMENTS (gl_errors);
const char *
_cogl_gl_error_to_string (GLenum error_code)
{
int i;
for (i = 0; i < n_gl_errors; i++)
{
if (gl_errors[i].error_code == error_code)
return gl_errors[i].error_string;
}
return "Unknown GL error";
}
#endif /* COGL_GL_DEBUG */
CoglFuncPtr
cogl_get_proc_address (const char* name)
{

1
cogl/cogl2-path.c
View File

@ -32,7 +32,6 @@
#include "cogl-util.h"
#include "cogl-object.h"
#include "cogl-internal.h"
#include "cogl-context-private.h"
#include "cogl-journal-private.h"
#include "cogl-pipeline-private.h"

1
cogl/driver/gl/cogl-attribute-gl.c
View File

@ -32,6 +32,7 @@
#include <string.h>
#include "cogl-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-error-private.h"
#include "cogl-context-private.h"

1
cogl/driver/gl/cogl-clip-stack-gl.c
View File

@ -30,6 +30,7 @@
#endif
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-primitives-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-path-private.h"

1
cogl/driver/gl/cogl-framebuffer-gl.c
View File

@ -27,6 +27,7 @@
#endif
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-framebuffer-private.h"
#include "cogl-framebuffer-gl-private.h"
#include "cogl-buffer-gl-private.h"

2
cogl/driver/gl/cogl-pipeline-fragend-fixed.c
View File

@ -30,13 +30,13 @@
#endif
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-state-private.h"
#include "cogl-pipeline-opengl-private.h"
#ifdef COGL_PIPELINE_FRAGEND_FIXED
#include "cogl-internal.h"
#include "cogl-context-private.h"
#include "cogl-object-private.h"

2
cogl/driver/gl/cogl-pipeline-fragend-glsl.c
View File

@ -33,6 +33,7 @@
#include <string.h>
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-layer-private.h"
#include "cogl-blend-string.h"
@ -40,7 +41,6 @@
#ifdef COGL_PIPELINE_FRAGEND_GLSL
#include "cogl-internal.h"
#include "cogl-context-private.h"
#include "cogl-object-private.h"
#include "cogl-shader-private.h"

1
cogl/driver/gl/cogl-pipeline-opengl.c
View File

@ -30,6 +30,7 @@
#endif
#include "cogl-debug.h"
#include "cogl-util-gl-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-context-private.h"

2
cogl/driver/gl/cogl-pipeline-progend-glsl.c
View File

@ -33,13 +33,13 @@
#include "cogl-util.h"
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-offscreen.h"
#ifdef COGL_PIPELINE_PROGEND_GLSL
#include "cogl-internal.h"
#include "cogl-context-private.h"
#include "cogl-object-private.h"
#include "cogl-program-private.h"

2
cogl/driver/gl/cogl-pipeline-vertend-fixed.c
View File

@ -30,6 +30,7 @@
#endif
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-state-private.h"
#include "cogl-pipeline-opengl-private.h"
@ -37,7 +38,6 @@
#ifdef COGL_PIPELINE_VERTEND_FIXED
#include "cogl-internal.h"
#include "cogl-context-private.h"
#include "cogl-object-private.h"
#include "cogl-program-private.h"

2
cogl/driver/gl/cogl-pipeline-vertend-glsl.c
View File

@ -32,12 +32,12 @@
#include <string.h>
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-opengl-private.h"
#ifdef COGL_PIPELINE_VERTEND_GLSL
#include "cogl-internal.h"
#include "cogl-context-private.h"
#include "cogl-object-private.h"
#include "cogl-program-private.h"

2
cogl/driver/gl/cogl-texture-gl.c
View File

@ -26,8 +26,8 @@
#include <strings.h>
#include "cogl-internal.h"
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-texture-gl-private.h"
#include "cogl-texture-3d-private.h"
#include "cogl-util.h"

36
cogl/driver/gl/cogl-util-gl-private.h
View File

@ -26,6 +26,42 @@
#ifndef _COGL_UTIL_GL_PRIVATE_H_
#include "cogl-types.h"
#include "cogl-context.h"
#include "cogl-gl-header.h"
#ifdef COGL_GL_DEBUG
const char *
_cogl_gl_error_to_string (GLenum error_code);
#define GE(ctx, x) G_STMT_START { \
GLenum __err; \
(ctx)->x; \
while ((__err = (ctx)->glGetError ()) != GL_NO_ERROR) \
{ \
g_warning ("%s: GL error (%d): %s\n", \
G_STRLOC, \
__err, \
_cogl_gl_error_to_string (__err)); \
} } G_STMT_END
#define GE_RET(ret, ctx, x) G_STMT_START { \
GLenum __err; \
ret = (ctx)->x; \
while ((__err = (ctx)->glGetError ()) != GL_NO_ERROR) \
{ \
g_warning ("%s: GL error (%d): %s\n", \
G_STRLOC, \
__err, \
_cogl_gl_error_to_string (__err)); \
} } G_STMT_END
#else /* !COGL_GL_DEBUG */
#define GE(ctx, x) ((ctx)->x)
#define GE_RET(ret, ctx, x) (ret = ((ctx)->x))
#endif /* COGL_GL_DEBUG */
CoglBool
_cogl_gl_util_catch_out_of_memory (CoglContext *ctx, CoglError **error);

39
cogl/driver/gl/cogl-util-gl.c
View File

@ -30,9 +30,46 @@
#include "cogl-types.h"
#include "cogl-context-private.h"
#include "cogl-error-private.h"
#include "cogl-internal.h"
#include "cogl-util-gl-private.h"
#ifdef COGL_GL_DEBUG
/* GL error to string conversion */
static const struct {
GLuint error_code;
const char *error_string;
} gl_errors[] = {
{ GL_NO_ERROR, "No error" },
{ GL_INVALID_ENUM, "Invalid enumeration value" },
{ GL_INVALID_VALUE, "Invalid value" },
{ GL_INVALID_OPERATION, "Invalid operation" },
#ifdef HAVE_COGL_GL
{ GL_STACK_OVERFLOW, "Stack overflow" },
{ GL_STACK_UNDERFLOW, "Stack underflow" },
#endif
{ GL_OUT_OF_MEMORY, "Out of memory" },
#ifdef GL_INVALID_FRAMEBUFFER_OPERATION_EXT
{ GL_INVALID_FRAMEBUFFER_OPERATION_EXT, "Invalid framebuffer operation" }
#endif
};
static const unsigned int n_gl_errors = G_N_ELEMENTS (gl_errors);
const char *
_cogl_gl_error_to_string (GLenum error_code)
{
int i;
for (i = 0; i < n_gl_errors; i++)
{
if (gl_errors[i].error_code == error_code)
return gl_errors[i].error_string;
}
return "Unknown GL error";
}
#endif /* COGL_GL_DEBUG */
CoglBool
_cogl_gl_util_catch_out_of_memory (CoglContext *ctx, CoglError **error)
{

2
cogl/driver/gl/gl/cogl-driver-gl.c
View File

@ -28,8 +28,8 @@
#include <string.h>
#include "cogl-private.h"
#include "cogl-internal.h"
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-feature-private.h"
#include "cogl-renderer-private.h"
#include "cogl-error-private.h"

2
cogl/driver/gl/gl/cogl-pipeline-fragend-arbfp.c
View File

@ -31,13 +31,13 @@
#include "cogl-debug.h"
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-state-private.h"
#include "cogl-pipeline-layer-private.h"
#ifdef COGL_PIPELINE_FRAGEND_ARBFP
#include "cogl-internal.h"
#include "cogl-context-private.h"
#include "cogl-object-private.h"

2
cogl/driver/gl/gles/cogl-driver-gles.c
View File

@ -27,8 +27,8 @@
#include <string.h>
#include "cogl-internal.h"
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-feature-private.h"
#include "cogl-renderer-private.h"
#include "cogl-private.h"

1
cogl/driver/nop/cogl-driver-nop.c
View File

@ -28,7 +28,6 @@
#include <string.h>
#include "cogl-private.h"
#include "cogl-internal.h"
#include "cogl-context-private.h"
#include "cogl-feature-private.h"
#include "cogl-renderer-private.h"

1
cogl/winsys/cogl-texture-pixmap-x11.c
View File

@ -31,7 +31,6 @@
#endif
#include "cogl-debug.h"
#include "cogl-internal.h"
#include "cogl-util.h"
#include "cogl-texture-pixmap-x11.h"
#include "cogl-texture-pixmap-x11-private.h"

1
doc/reference/cogl-2.0-experimental/Makefile.am
View File

@ -81,7 +81,6 @@ IGNORE_HFILES=\
cogl-gl-header.h \
cogl-glsl-shader-boilerplate.h \
cogl-deprecated.h \
cogl-internal.h \
cogl-profile.h \
cogl-queue.h \
cogl-rectangle-map.h \