isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-22 19:12:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

cogl: Require relative full paths when including

Browse Source 
I.e. including a OpenGL driver file, the path "driver/gl/..." must be
specified when including.
This commit is contained in:
Jonas Ådahl 2018-05-21 21:57:38 +02:00
parent 530861b24d
commit 9dbdf6b724
62 changed files with 154 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cogl/cogl/Makefile.am
View File

@ -13,11 +13,6 @@ DISTCLEANFILES =
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(srcdir)/deprecated \
-I$(srcdir)/winsys \
-I$(srcdir)/driver/gl \
-I$(srcdir)/driver/gl/gl \
-I$(srcdir)/driver/gl/gles \
$(NULL)
AM_CPPFLAGS += \

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

@ -44,13 +44,13 @@
#include "cogl-texture-driver.h"
#include "cogl-rectangle-map.h"
#include "cogl-journal-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-atlas.h"
#include "cogl1-context.h"
#include "cogl-sub-texture.h"
#include "cogl-error-private.h"
#include "cogl-texture-gl-private.h"
#include "cogl-gtype-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#include "driver/gl/cogl-texture-gl-private.h"
#include <stdlib.h>

2
cogl/cogl/cogl-atlas.c
View File

@ -38,11 +38,11 @@
#include "cogl-texture-2d-private.h"
#include "cogl-texture-2d-sliced.h"
#include "cogl-texture-driver.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-debug.h"
#include "cogl-framebuffer-private.h"
#include "cogl-blit.h"
#include "cogl-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#include <stdlib.h>

8
cogl/cogl/cogl-attribute.c
View File

@ -41,15 +41,15 @@
#include "cogl-attribute-private.h"
#include "cogl-pipeline.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-texture-private.h"
#include "cogl-framebuffer-private.h"
#include "cogl-indices-private.h"
#ifdef COGL_PIPELINE_PROGEND_GLSL
#include "cogl-pipeline-progend-glsl-private.h"
#endif
#include "cogl-private.h"
#include "cogl-gtype-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#ifdef COGL_PIPELINE_PROGEND_GLSL
#include "driver/gl/cogl-pipeline-progend-glsl-private.h"
#endif
#include <string.h>
#include <stdio.h>

2
cogl/cogl/cogl-bitmap.c
View File

@ -37,9 +37,9 @@
#include "cogl-buffer-private.h"
#include "cogl-pixel-buffer.h"
#include "cogl-context-private.h"
#include "cogl-buffer-gl-private.h"
#include "cogl-error-private.h"
#include "cogl-gtype-private.h"
#include "driver/gl/cogl-buffer-gl-private.h"
#include <string.h>

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

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

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

@ -44,14 +44,12 @@
#include "cogl-matrix-private.h"
#include "cogl-primitives-private.h"
#include "cogl-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-attribute-private.h"
#include "cogl-primitive-private.h"
#include "cogl1-context.h"
#include "cogl-offscreen.h"
#include "cogl-matrix-stack.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
static void *
_cogl_clip_stack_push_entry (CoglClipStack *clip_stack,

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

@ -32,7 +32,6 @@
#define __COGL_CONTEXT_PRIVATE_H
#include "cogl-context.h"
#include "cogl-winsys-private.h"
#include "cogl-flags.h"
#ifdef COGL_HAS_XLIB_SUPPORT
@ -62,6 +61,7 @@
#include "cogl-poll-private.h"
#include "cogl-path/cogl-path-types.h"
#include "cogl-private.h"
#include "winsys/cogl-winsys-private.h"
typedef struct
{

10
cogl/cogl/cogl-context.c
View File

@ -32,12 +32,9 @@
#include "cogl-object.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"
@ -46,7 +43,6 @@
#include "cogl-texture-3d-private.h"
#include "cogl-texture-rectangle-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-framebuffer-private.h"
#include "cogl-onscreen-private.h"
#include "cogl-attribute-private.h"
@ -55,8 +51,12 @@
#include "cogl-config-private.h"
#include "cogl-error-private.h"
#include "cogl-gtype-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#include "driver/gl/cogl-util-gl-private.h"
#include "winsys/cogl-winsys-private.h"
#include "winsys/cogl-winsys-stub-private.h"
#include "cogl/deprecated/cogl-framebuffer-deprecated.h"
#include "deprecated/cogl-framebuffer-deprecated.h"
#include <string.h>
#include <stdlib.h>

2
cogl/cogl/cogl-display.c
View File

@ -38,11 +38,11 @@
#include "cogl-display-private.h"
#include "cogl-renderer-private.h"
#include "cogl-winsys-private.h"
#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
#include "cogl-wayland-server.h"
#endif
#include "cogl-gtype-private.h"
#include "winsys/cogl-winsys-private.h"
static void _cogl_display_free (CoglDisplay *display);

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

@ -33,6 +33,8 @@
#include <glib.h>
#include "cogl-context.h"
#include "cogl-renderer.h"
#define COGL_CHECK_GL_VERSION(driver_major, driver_minor, \
target_major, target_minor) \

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

@ -33,7 +33,7 @@
#include "cogl-fence.h"
#include "cogl-list.h"
#include "cogl-winsys-private.h"
#include "winsys/cogl-winsys-private.h"
typedef enum
{

2
cogl/cogl/cogl-fence.c
View File

@ -32,7 +32,7 @@
#include "cogl-fence.h"
#include "cogl-fence-private.h"
#include "cogl-context-private.h"
#include "cogl-winsys-private.h"
#include "winsys/cogl-winsys-private.h"
#define FENCE_CHECK_TIMEOUT 5000 /* microseconds */

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

@ -34,7 +34,7 @@
#include "cogl-object-private.h"
#include "cogl-matrix-stack-private.h"
#include "cogl-journal-private.h"
#include "cogl-winsys-private.h"
#include "winsys/cogl-winsys-private.h"
#include "cogl-attribute-private.h"
#include "cogl-offscreen.h"
#include "cogl-gl-header.h"

4
cogl/cogl/cogl-framebuffer.c
View File

@ -43,7 +43,6 @@
#include "cogl-onscreen-template-private.h"
#include "cogl-clip-stack.h"
#include "cogl-journal-private.h"
#include "cogl-winsys-private.h"
#include "cogl-pipeline-state-private.h"
#include "cogl-matrix-private.h"
#include "cogl-primitive-private.h"
@ -52,8 +51,9 @@
#include "cogl-private.h"
#include "cogl-primitives-private.h"
#include "cogl-error-private.h"
#include "cogl-texture-gl-private.h"
#include "cogl-gtype-private.h"
#include "driver/gl/cogl-texture-gl-private.h"
#include "winsys/cogl-winsys-private.h"
extern CoglObjectClass _cogl_onscreen_class;

4
cogl/cogl/cogl-gles2-context.c
View File

@ -43,15 +43,15 @@
#include "cogl-context-private.h"
#include "cogl-display-private.h"
#include "cogl-framebuffer-private.h"
#include "cogl-framebuffer-gl-private.h"
#include "cogl-onscreen-template-private.h"
#include "cogl-renderer-private.h"
#include "cogl-swap-chain-private.h"
#include "cogl-texture-2d-gl.h"
#include "cogl-texture-2d-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-error-private.h"
#include "cogl-gtype-private.h"
#include "driver/gl/cogl-framebuffer-gl-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
static void _cogl_gles2_context_free (CoglGLES2Context *gles2_context);

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

@ -35,9 +35,9 @@
#include "cogl-config.h"
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-glsl-shader-private.h"
#include "cogl-glsl-shader-boilerplate.h"
#include "driver/gl/cogl-util-gl-private.h"
#include <string.h>

2
cogl/cogl/cogl-glx-renderer-private.h
View File

@ -96,7 +96,7 @@ typedef struct _CoglGLXRenderer
#define COGL_WINSYS_FEATURE_END()
#include "cogl-winsys-glx-feature-functions.h"
#include "winsys/cogl-winsys-glx-feature-functions.h"
#undef COGL_WINSYS_FEATURE_BEGIN
#undef COGL_WINSYS_FEATURE_FUNCTION

4
cogl/cogl/cogl-journal.c
View File

@ -35,14 +35,14 @@
#include "cogl-journal-private.h"
#include "cogl-texture-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-vertex-buffer-private.h"
#include "cogl-framebuffer-private.h"
#include "cogl-profile.h"
#include "cogl-attribute-private.h"
#include "cogl-point-in-poly-private.h"
#include "cogl-private.h"
#include "cogl1-context.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#include "deprecated/cogl-vertex-buffer-private.h"
#include <string.h>
#include <gmodule.h>

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

@ -34,7 +34,6 @@
#include "cogl-config.h"
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-matrix-stack.h"
#include "cogl-framebuffer-private.h"
#include "cogl-object-private.h"
@ -42,6 +41,7 @@
#include "cogl-matrix-private.h"
#include "cogl-magazine-private.h"
#include "cogl-gtype-private.h"
#include "driver/gl/cogl-util-gl-private.h"
static void _cogl_matrix_stack_free (CoglMatrixStack *stack);

2
cogl/cogl/cogl-pipeline-layer.c
View File

@ -42,9 +42,9 @@
#include "cogl-pipeline-layer-state-private.h"
#include "cogl-pipeline-layer-state.h"
#include "cogl-node-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-context-private.h"
#include "cogl-texture-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#include <string.h>

8
cogl/cogl/cogl-pipeline.c
View File

@ -38,7 +38,6 @@
#include "cogl-object.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-pipeline-state-private.h"
#include "cogl-pipeline-layer-state-private.h"
#include "cogl-texture-private.h"
@ -50,6 +49,7 @@
#include "cogl-depth-state-private.h"
#include "cogl1-context.h"
#include "cogl-gtype-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#include <glib.h>
#include <glib/gprintf.h>
@ -67,15 +67,15 @@ const CoglPipelineProgend *
_cogl_pipeline_progends[MAX (COGL_PIPELINE_N_PROGENDS, 1)];
#ifdef COGL_PIPELINE_FRAGEND_GLSL
#include "cogl-pipeline-fragend-glsl-private.h"
#include "driver/gl/cogl-pipeline-fragend-glsl-private.h"
#endif
#ifdef COGL_PIPELINE_VERTEND_GLSL
#include "cogl-pipeline-vertend-glsl-private.h"
#include "driver/gl/cogl-pipeline-vertend-glsl-private.h"
#endif
#ifdef COGL_PIPELINE_PROGEND_GLSL
#include "cogl-pipeline-progend-glsl-private.h"
#include "driver/gl/cogl-pipeline-progend-glsl-private.h"
#endif
COGL_OBJECT_DEFINE (Pipeline, pipeline);

2
cogl/cogl/cogl-poll.c
View File

@ -34,8 +34,8 @@
#include "cogl-poll.h"
#include "cogl-poll-private.h"
#include "cogl-winsys-private.h"
#include "cogl-renderer-private.h"
#include "winsys/cogl-winsys-private.h"
struct _CoglPollSource
{

4
cogl/cogl/cogl-primitives.c
View File

@ -35,8 +35,6 @@
#include "cogl-journal-private.h"
#include "cogl-texture-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-vertex-buffer-private.h"
#include "cogl-framebuffer-private.h"
#include "cogl-attribute-private.h"
#include "cogl-private.h"
@ -44,6 +42,8 @@
#include "cogl-framebuffer-private.h"
#include "cogl1-context.h"
#include "cogl-primitives-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#include "deprecated/cogl-vertex-buffer-private.h"
#include <string.h>
#include <math.h>

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

@ -34,11 +34,11 @@
#include <gmodule.h>
#include "cogl-object-private.h"
#include "cogl-winsys-private.h"
#include "cogl-driver.h"
#include "cogl-texture-driver.h"
#include "cogl-context.h"
#include "cogl-closure-list-private.h"
#include "winsys/cogl-winsys-private.h"
#ifdef COGL_HAS_XLIB_SUPPORT
#include <X11/Xlib.h>

11
cogl/cogl/cogl-renderer.c
View File

@ -38,23 +38,24 @@
#include "cogl-private.h"
#include "cogl-object.h"
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-mutter.h"
#include "cogl-renderer.h"
#include "cogl-renderer-private.h"
#include "cogl-display-private.h"
#include "cogl-winsys-private.h"
#include "cogl-winsys-stub-private.h"
#include "cogl-config-private.h"
#include "cogl-error-private.h"
#include "cogl-gtype-private.h"
#include "driver/gl/cogl-util-gl-private.h"
#include "winsys/cogl-winsys-private.h"
#include "winsys/cogl-winsys-stub-private.h"
#ifdef COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT
#include "cogl-winsys-egl-x11-private.h"
#include "winsys/cogl-winsys-egl-x11-private.h"
#endif
#ifdef COGL_HAS_GLX_SUPPORT
#include "cogl-winsys-glx-private.h"
#include "winsys/cogl-winsys-glx-private.h"
#endif
#ifdef COGL_HAS_XLIB_SUPPORT

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

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

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

@ -42,8 +42,8 @@
#include "cogl-texture-driver.h"
#include "cogl-texture-rectangle-private.h"
#include "cogl-texture-2d.h"
#include "cogl-texture-gl-private.h"
#include "cogl-gtype-private.h"
#include "driver/gl/cogl-texture-gl-private.h"
#include <string.h>
#include <math.h>

6
cogl/cogl/cogl-texture-2d-sliced.c
View File

@ -44,17 +44,17 @@
#include "cogl-texture-2d-gl.h"
#include "cogl-texture-2d-private.h"
#include "cogl-texture-2d-sliced-private.h"
#include "cogl-texture-gl-private.h"
#include "cogl-texture-driver.h"
#include "cogl-context-private.h"
#include "cogl-object-private.h"
#include "cogl-spans.h"
#include "cogl-journal-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-primitive-texture.h"
#include "cogl-error-private.h"
#include "cogl-texture-gl-private.h"
#include "cogl-gtype-private.h"
#include "driver/gl/cogl-texture-gl-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#include "driver/gl/cogl-texture-gl-private.h"
#include <string.h>
#include <stdlib.h>

10
cogl/cogl/cogl-texture-2d.c
View File

@ -37,18 +37,18 @@
#include "cogl-util.h"
#include "cogl-texture-private.h"
#include "cogl-texture-2d-private.h"
#include "cogl-texture-2d-gl-private.h"
#include "cogl-texture-driver.h"
#include "cogl-context-private.h"
#include "cogl-object-private.h"
#include "cogl-journal-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-framebuffer-private.h"
#include "cogl-error-private.h"
#ifdef COGL_HAS_EGL_SUPPORT
#include "cogl-winsys-egl-private.h"
#endif
#include "cogl-gtype-private.h"
#include "driver/gl/cogl-texture-2d-gl-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#ifdef COGL_HAS_EGL_SUPPORT
#include "winsys/cogl-winsys-egl-private.h"
#endif
#include <string.h>
#include <math.h>

6
cogl/cogl/cogl-texture-3d.c
View File

@ -36,16 +36,16 @@
#include "cogl-texture-private.h"
#include "cogl-texture-3d-private.h"
#include "cogl-texture-3d.h"
#include "cogl-texture-gl-private.h"
#include "cogl-texture-driver.h"
#include "cogl-context-private.h"
#include "cogl-object-private.h"
#include "cogl-journal-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-error-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-gtype-private.h"
#include "driver/gl/cogl-texture-gl-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#include "driver/gl/cogl-util-gl-private.h"
#include <string.h>
#include <math.h>

4
cogl/cogl/cogl-texture-rectangle.c
View File

@ -41,10 +41,10 @@
#include "cogl-context-private.h"
#include "cogl-object-private.h"
#include "cogl-journal-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-error-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-gtype-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#include "driver/gl/cogl-util-gl-private.h"
#include <string.h>
#include <math.h>

2
cogl/cogl/cogl-xlib-renderer-private.h
View File

@ -31,6 +31,8 @@
#ifndef __COGL_RENDERER_XLIB_PRIVATE_H
#define __COGL_RENDERER_XLIB_PRIVATE_H
#include <X11/Xutil.h>
#include "cogl-object-private.h"
#include "cogl-xlib-private.h"
#include "cogl-x11-renderer-private.h"

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

@ -39,9 +39,9 @@
#include "cogl-renderer-private.h"
#include "cogl-xlib-renderer-private.h"
#include "cogl-x11-renderer-private.h"
#include "cogl-winsys-private.h"
#include "cogl-error-private.h"
#include "cogl-poll-private.h"
#include "winsys/cogl-winsys-private.h"
#include <X11/Xlib.h>
#include <X11/extensions/Xdamage.h>

8
cogl/cogl/cogl.c
View File

@ -39,8 +39,6 @@
#include "cogl-util.h"
#include "cogl-context-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-winsys-private.h"
#include "cogl-framebuffer-private.h"
#include "cogl-matrix-private.h"
#include "cogl-journal-private.h"
@ -54,8 +52,10 @@
#include "cogl-private.h"
#include "cogl1-context.h"
#include "cogl-offscreen.h"
#include "cogl-attribute-gl-private.h"
#include "cogl-clutter.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#include "driver/gl/cogl-attribute-gl-private.h"
#include "winsys/cogl-winsys-private.h"
#include "deprecated/cogl-clutter.h"
#include "deprecated/cogl-framebuffer-deprecated.h"

6
cogl/cogl/deprecated/cogl-clutter.c
View File

@ -38,15 +38,15 @@
#include "cogl-types.h"
#include "cogl-private.h"
#include "cogl-context-private.h"
#include "cogl-winsys-private.h"
#include "cogl-winsys-stub-private.h"
#include "cogl-framebuffer-private.h"
#include "cogl-onscreen-private.h"
#ifdef COGL_HAS_XLIB_SUPPORT
#include "cogl-clutter-xlib.h"
#include "cogl-xlib-renderer.h"
#endif
#include "cogl-clutter.h"
#include "winsys/cogl-winsys-private.h"
#include "winsys/cogl-winsys-stub-private.h"
#include "deprecated/cogl-clutter.h"
CoglBool
cogl_clutter_check_extension (const char *name, const char *ext)

2
cogl/cogl/deprecated/cogl-material-compat.c
View File

@ -31,12 +31,12 @@
#include "cogl-config.h"
#include <cogl-material-compat.h>
#include <cogl-pipeline.h>
#include <cogl-pipeline-private.h>
#include <cogl-types.h>
#include <cogl-matrix.h>
#include <cogl-context-private.h>
#include <deprecated/cogl-material-compat.h>
G_DEFINE_BOXED_TYPE (CoglMaterial, cogl_material,
cogl_object_ref, cogl_object_unref)

6
cogl/cogl/deprecated/cogl-program.c
View File

@ -31,12 +31,12 @@
#include "cogl-config.h"
#include "cogl-util.h"
#include "cogl-util-gl-private.h"
#include "driver/gl/cogl-util-gl-private.h"
#include "cogl-context-private.h"
#include "cogl-object-private.h"
#include "cogl-shader-private.h"
#include "cogl-program-private.h"
#include "deprecated/cogl-shader-private.h"
#include "deprecated/cogl-program-private.h"
#include <string.h>

4
cogl/cogl/deprecated/cogl-shader.c
View File

@ -30,12 +30,12 @@
#include "cogl-config.h"
#include "cogl-shader-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-context-private.h"
#include "cogl-object-private.h"
#include "cogl-glsl-shader-private.h"
#include "cogl-glsl-shader-boilerplate.h"
#include "driver/gl/cogl-util-gl-private.h"
#include "deprecated/cogl-shader-private.h"
#include <glib.h>

2
cogl/cogl/deprecated/cogl-vertex-buffer.c
View File

@ -104,7 +104,6 @@
#include "cogl-util.h"
#include "cogl-context-private.h"
#include "cogl-object-private.h"
#include "cogl-vertex-buffer-private.h"
#include "cogl-texture-private.h"
#include "cogl-pipeline.h"
#include "cogl-pipeline-private.h"
@ -114,6 +113,7 @@
#include "cogl-journal-private.h"
#include "cogl1-context.h"
#include "cogl-vertex-buffer.h"
#include "deprecated/cogl-vertex-buffer-private.h"
#define PAD_FOR_ALIGNMENT(VAR, TYPE_SIZE) \
(VAR = TYPE_SIZE + ((VAR - 1) & ~(TYPE_SIZE - 1)))

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

@ -37,15 +37,15 @@
#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"
#include "cogl-attribute.h"
#include "cogl-attribute-private.h"
#include "cogl-attribute-gl-private.h"
#include "cogl-pipeline-progend-glsl-private.h"
#include "cogl-buffer-gl-private.h"
#include "driver/gl/cogl-attribute-gl-private.h"
#include "driver/gl/cogl-buffer-gl-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#include "driver/gl/cogl-pipeline-progend-glsl-private.h"
#include "driver/gl/cogl-util-gl-private.h"
typedef struct _ForeachChangedBitState
{

4
cogl/cogl/driver/gl/cogl-buffer-gl.c
View File

@ -35,9 +35,9 @@
#include "cogl-config.h"
#include "cogl-context-private.h"
#include "cogl-buffer-gl-private.h"
#include "driver/gl/cogl-buffer-gl-private.h"
#include "cogl-error-private.h"
#include "cogl-util-gl-private.h"
#include "driver/gl/cogl-util-gl-private.h"
/*
* GL/GLES compatibility defines for the buffer API:

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

@ -35,11 +35,11 @@
#include "cogl-config.h"
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-primitives-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-clip-stack-gl-private.h"
#include "cogl-primitive-private.h"
#include "driver/gl/cogl-util-gl-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#include "driver/gl/cogl-clip-stack-gl-private.h"
#ifndef GL_CLIP_PLANE0
#define GL_CLIP_PLANE0 0x3000

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

@ -31,13 +31,13 @@
#include "cogl-config.h"
#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"
#include "cogl-error-private.h"
#include "cogl-texture-gl-private.h"
#include "cogl-texture-private.h"
#include "driver/gl/cogl-util-gl-private.h"
#include "driver/gl/cogl-framebuffer-gl-private.h"
#include "driver/gl/cogl-buffer-gl-private.h"
#include "driver/gl/cogl-texture-gl-private.h"
#include <glib.h>
#include <string.h>

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

@ -37,22 +37,22 @@
#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"
#include "cogl-snippet-private.h"
#include "cogl-list.h"
#include "driver/gl/cogl-util-gl-private.h"
#ifdef COGL_PIPELINE_FRAGEND_GLSL
#include "cogl-context-private.h"
#include "cogl-object-private.h"
#include "cogl-shader-private.h"
#include "cogl-program-private.h"
#include "cogl-pipeline-cache.h"
#include "cogl-pipeline-fragend-glsl-private.h"
#include "cogl-glsl-shader-private.h"
#include "driver/gl/cogl-pipeline-fragend-glsl-private.h"
#include "deprecated/cogl-shader-private.h"
#include "deprecated/cogl-program-private.h"
#include <glib.h>

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

@ -34,16 +34,16 @@
#include "cogl-config.h"
#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"
#include "cogl-texture-private.h"
#include "cogl-framebuffer-private.h"
#include "cogl-offscreen.h"
#include "cogl-texture-gl-private.h"
#include "driver/gl/cogl-util-gl-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#include "driver/gl/cogl-texture-gl-private.h"
#include "cogl-pipeline-progend-glsl-private.h"
#include "driver/gl/cogl-pipeline-progend-glsl-private.h"
#include <test-fixtures/test-unit.h>

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

@ -37,23 +37,23 @@
#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"
#include "driver/gl/cogl-util-gl-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#ifdef COGL_PIPELINE_PROGEND_GLSL
#include "cogl-context-private.h"
#include "cogl-object-private.h"
#include "cogl-program-private.h"
#include "cogl-pipeline-fragend-glsl-private.h"
#include "cogl-pipeline-vertend-glsl-private.h"
#include "cogl-pipeline-cache.h"
#include "cogl-pipeline-state-private.h"
#include "cogl-attribute-private.h"
#include "cogl-framebuffer-private.h"
#include "cogl-pipeline-progend-glsl-private.h"
#include "driver/gl/cogl-pipeline-fragend-glsl-private.h"
#include "driver/gl/cogl-pipeline-vertend-glsl-private.h"
#include "driver/gl/cogl-pipeline-progend-glsl-private.h"
#include "deprecated/cogl-program-private.h"
/* These are used to generalise updating some uniforms that are
required when building for drivers missing some fixed function

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

@ -38,18 +38,18 @@
#include <test-fixtures/test-unit.h>
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "driver/gl/cogl-util-gl-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#ifdef COGL_PIPELINE_VERTEND_GLSL
#include "cogl-context-private.h"
#include "cogl-object-private.h"
#include "cogl-program-private.h"
#include "cogl-pipeline-vertend-glsl-private.h"
#include "cogl-pipeline-state-private.h"
#include "cogl-glsl-shader-private.h"
#include "driver/gl/cogl-pipeline-vertend-glsl-private.h"
#include "deprecated/cogl-program-private.h"
const CoglPipelineVertend _cogl_pipeline_glsl_vertend;

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

@ -39,12 +39,12 @@
#include "cogl-private.h"
#include "cogl-texture-private.h"
#include "cogl-texture-2d-gl.h"
#include "cogl-texture-2d-gl-private.h"
#include "cogl-texture-2d-private.h"
#include "cogl-texture-gl-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-error-private.h"
#include "cogl-util-gl-private.h"
#include "driver/gl/cogl-texture-2d-gl-private.h"
#include "driver/gl/cogl-texture-gl-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#include "driver/gl/cogl-util-gl-private.h"
#if defined (COGL_HAS_EGL_SUPPORT)

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

@ -32,11 +32,11 @@
#include <strings.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"
#include "cogl-pipeline-opengl-private.h"
#include "driver/gl/cogl-util-gl-private.h"
#include "driver/gl/cogl-texture-gl-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
static inline int
calculate_alignment (int rowstride)

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

@ -35,7 +35,7 @@
#include "cogl-types.h"
#include "cogl-context-private.h"
#include "cogl-error-private.h"
#include "cogl-util-gl-private.h"
#include "driver/gl/cogl-util-gl-private.h"
#ifdef COGL_GL_DEBUG
/* GL error to string conversion */

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

@ -34,15 +34,15 @@
#include "cogl-private.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"
#include "cogl-framebuffer-gl-private.h"
#include "cogl-texture-2d-gl-private.h"
#include "cogl-attribute-gl-private.h"
#include "cogl-clip-stack-gl-private.h"
#include "cogl-buffer-gl-private.h"
#include "driver/gl/cogl-util-gl-private.h"
#include "driver/gl/cogl-framebuffer-gl-private.h"
#include "driver/gl/cogl-texture-2d-gl-private.h"
#include "driver/gl/cogl-attribute-gl-private.h"
#include "driver/gl/cogl-clip-stack-gl-private.h"
#include "driver/gl/cogl-buffer-gl-private.h"
static CoglBool
_cogl_driver_pixel_format_from_gl_internal (CoglContext *context,

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

@ -44,10 +44,10 @@
#include "cogl-context-private.h"
#include "cogl-object-private.h"
#include "cogl-primitives.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-error-private.h"
#include "cogl-texture-gl-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#include "driver/gl/cogl-util-gl-private.h"
#include "driver/gl/cogl-texture-gl-private.h"
#include <string.h>
#include <stdlib.h>

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

@ -33,15 +33,15 @@
#include <string.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"
#include "cogl-framebuffer-gl-private.h"
#include "cogl-texture-2d-gl-private.h"
#include "cogl-attribute-gl-private.h"
#include "cogl-clip-stack-gl-private.h"
#include "cogl-buffer-gl-private.h"
#include "driver/gl/cogl-util-gl-private.h"
#include "driver/gl/cogl-framebuffer-gl-private.h"
#include "driver/gl/cogl-texture-2d-gl-private.h"
#include "driver/gl/cogl-attribute-gl-private.h"
#include "driver/gl/cogl-clip-stack-gl-private.h"
#include "driver/gl/cogl-buffer-gl-private.h"
#ifndef GL_UNSIGNED_INT_24_8
#define GL_UNSIGNED_INT_24_8 0x84FA

6
cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
View File

@ -41,13 +41,13 @@
#include "cogl-bitmap-private.h"
#include "cogl-texture-private.h"
#include "cogl-pipeline.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-context-private.h"
#include "cogl-object-private.h"
#include "cogl-primitives.h"
#include "cogl-util-gl-private.h"
#include "cogl-error-private.h"
#include "cogl-texture-gl-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#include "driver/gl/cogl-util-gl-private.h"
#include "driver/gl/cogl-texture-gl-private.h"
#include <string.h>
#include <stdlib.h>

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

@ -49,13 +49,13 @@
#include "cogl-display-private.h"
#include "cogl-renderer-private.h"
#include "cogl-object-private.h"
#include "cogl-winsys-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-xlib.h"
#include "cogl-error-private.h"
#include "cogl-texture-gl-private.h"
#include "cogl-private.h"
#include "cogl-gtype-private.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#include "driver/gl/cogl-texture-gl-private.h"
#include "winsys/cogl-winsys-private.h"
#include <X11/Xlib.h>
#include <X11/Xutil.h>

4
cogl/cogl/winsys/cogl-winsys-egl-private.h
View File

@ -32,10 +32,10 @@
#define __COGL_WINSYS_EGL_PRIVATE_H
#include "cogl-defines.h"
#include "cogl-winsys-private.h"
#include "cogl-context.h"
#include "cogl-context-private.h"
#include "cogl-framebuffer-private.h"
#include "winsys/cogl-winsys-private.h"
/* XXX: depending on what version of Mesa you have then
* eglQueryWaylandBuffer may take a wl_buffer or wl_resource argument
@ -132,7 +132,7 @@ typedef struct _CoglRendererEGL
#define COGL_WINSYS_FEATURE_END()
#include "cogl-winsys-egl-feature-functions.h"
#include "winsys/cogl-winsys-egl-feature-functions.h"
#undef COGL_WINSYS_FEATURE_BEGIN
#undef COGL_WINSYS_FEATURE_FUNCTION

2
cogl/cogl/winsys/cogl-winsys-egl-x11-private.h
View File

@ -31,7 +31,7 @@
#ifndef __COGL_WINSYS_EGL_X11_PRIVATE_H
#define __COGL_WINSYS_EGL_X11_PRIVATE_H
#include "cogl-winsys-private.h"
#include "winsys/cogl-winsys-private.h"
const CoglWinsysVtable *
_cogl_winsys_egl_xlib_get_vtable (void);

5
cogl/cogl/winsys/cogl-winsys-egl-x11.c
View File

@ -35,20 +35,19 @@
#include <X11/Xlib.h>
#include "cogl-winsys-egl-x11-private.h"
#include "cogl-winsys-egl-private.h"
#include "cogl-xlib-renderer-private.h"
#include "cogl-xlib-renderer.h"
#include "cogl-framebuffer-private.h"
#include "cogl-onscreen-private.h"
#include "cogl-display-private.h"
#include "cogl-renderer-private.h"
#include "cogl-texture-pixmap-x11-private.h"
#include "cogl-texture-2d-private.h"
#include "cogl-texture-2d.h"
#include "cogl-error-private.h"
#include "cogl-poll-private.h"
#include "winsys/cogl-winsys-egl-x11-private.h"
#include "winsys/cogl-winsys-egl-private.h"
#define COGL_ONSCREEN_X11_EVENT_MASK (StructureNotifyMask | ExposureMask)

9
cogl/cogl/winsys/cogl-winsys-egl.c
View File

@ -34,8 +34,6 @@
#include "cogl-i18n-private.h"
#include "cogl-util.h"
#include "cogl-winsys-egl-private.h"
#include "cogl-winsys-private.h"
#include "cogl-feature-private.h"
#include "cogl-context-private.h"
#include "cogl-framebuffer.h"
@ -46,8 +44,9 @@
#include "cogl-gles2-context-private.h"
#include "cogl-error-private.h"
#include "cogl-egl.h"
#include "cogl-private.h"
#include "winsys/cogl-winsys-egl-private.h"
#include "winsys/cogl-winsys-private.h"
#include <stdlib.h>
#include <stdio.h>
@ -86,7 +85,7 @@
#define COGL_WINSYS_FEATURE_END() \
{ NULL, 0 }, \
};
#include "cogl-winsys-egl-feature-functions.h"
#include "winsys/cogl-winsys-egl-feature-functions.h"
/* Define an array of features */
#undef COGL_WINSYS_FEATURE_BEGIN
@ -103,7 +102,7 @@
static const CoglFeatureData winsys_feature_data[] =
{
#include "cogl-winsys-egl-feature-functions.h"
#include "winsys/cogl-winsys-egl-feature-functions.h"
};
static const char *

10
cogl/cogl/winsys/cogl-winsys-glx.c
View File

@ -34,7 +34,6 @@
#include "cogl-i18n-private.h"
#include "cogl-util.h"
#include "cogl-winsys-private.h"
#include "cogl-feature-private.h"
#include "cogl-context-private.h"
#include "cogl-framebuffer.h"
@ -46,18 +45,19 @@
#include "cogl-private.h"
#include "cogl-texture-2d-private.h"
#include "cogl-texture-rectangle-private.h"
#include "cogl-pipeline-opengl-private.h"
#include "cogl-frame-info-private.h"
#include "cogl-framebuffer-private.h"
#include "cogl-onscreen-private.h"
#include "cogl-swap-chain-private.h"
#include "cogl-xlib-renderer.h"
#include "cogl-util.h"
#include "cogl-winsys-glx-private.h"
#include "cogl-error-private.h"
#include "cogl-poll-private.h"
#include "cogl-version.h"
#include "cogl-glx.h"
#include "driver/gl/cogl-pipeline-opengl-private.h"
#include "winsys/cogl-winsys-private.h"
#include "winsys/cogl-winsys-glx-private.h"
#include <stdlib.h>
#include <sys/types.h>
@ -142,7 +142,7 @@ typedef struct _CoglTexturePixmapGLX
#define COGL_WINSYS_FEATURE_END() \
{ NULL, 0 }, \
};
#include "cogl-winsys-glx-feature-functions.h"
#include "winsys/cogl-winsys-glx-feature-functions.h"
/* Define an array of features */
#undef COGL_WINSYS_FEATURE_BEGIN
@ -163,7 +163,7 @@ typedef struct _CoglTexturePixmapGLX
static const CoglFeatureData winsys_feature_data[] =
{
#include "cogl-winsys-glx-feature-functions.h"
#include "winsys/cogl-winsys-glx-feature-functions.h"
};
static CoglFuncPtr

2
cogl/cogl/winsys/cogl-winsys-stub.c
View File

@ -38,7 +38,7 @@
#include "cogl-context-private.h"
#include "cogl-framebuffer-private.h"
#include "cogl-private.h"
#include "cogl-winsys-stub-private.h"
#include "winsys/cogl-winsys-stub-private.h"
#include <string.h>