[mutter] cogl: Remove unneeded driver/ includes from the core



commit f297a5faa56a9157ecb382c3e9f0d52728b9d8dc
Author: Adam Jackson <ajax redhat com>
Date:   Fri Oct 18 13:10:04 2019 -0400

    cogl: Remove unneeded driver/ includes from the core
    
    https://gitlab.gnome.org/GNOME/mutter/merge_requests/874

 cogl/cogl/cogl-atlas.c                     | 1 -
 cogl/cogl/cogl-attribute.c                 | 4 ----
 cogl/cogl/cogl-clip-stack.c                | 1 -
 cogl/cogl/cogl-framebuffer.c               | 1 -
 cogl/cogl/cogl-journal.c                   | 1 -
 cogl/cogl/cogl-pipeline.c                  | 1 -
 cogl/cogl/cogl-primitives.c                | 1 -
 cogl/cogl/cogl-texture-2d-sliced.c         | 2 --
 cogl/cogl/cogl-texture-2d.c                | 1 -
 cogl/cogl/cogl.c                           | 2 --
 cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 1 -
 11 files changed, 16 deletions(-)
---
diff --git a/cogl/cogl/cogl-atlas.c b/cogl/cogl/cogl-atlas.c
index 0cd965640..3333f2f94 100644
--- a/cogl/cogl/cogl-atlas.c
+++ b/cogl/cogl/cogl-atlas.c
@@ -42,7 +42,6 @@
 #include "cogl-framebuffer-private.h"
 #include "cogl-blit.h"
 #include "cogl-private.h"
-#include "driver/gl/cogl-pipeline-opengl-private.h"
 
 #include <stdlib.h>
 
diff --git a/cogl/cogl/cogl-attribute.c b/cogl/cogl/cogl-attribute.c
index 731da1543..78ac45968 100644
--- a/cogl/cogl/cogl-attribute.c
+++ b/cogl/cogl/cogl-attribute.c
@@ -46,10 +46,6 @@
 #include "cogl-indices-private.h"
 #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>
diff --git a/cogl/cogl/cogl-clip-stack.c b/cogl/cogl/cogl-clip-stack.c
index 0461687e7..092510714 100644
--- a/cogl/cogl/cogl-clip-stack.c
+++ b/cogl/cogl/cogl-clip-stack.c
@@ -49,7 +49,6 @@
 #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,
diff --git a/cogl/cogl/cogl-framebuffer.c b/cogl/cogl/cogl-framebuffer.c
index 9ffc4d136..a9fffac5b 100644
--- a/cogl/cogl/cogl-framebuffer.c
+++ b/cogl/cogl/cogl-framebuffer.c
@@ -52,7 +52,6 @@
 #include "cogl-private.h"
 #include "cogl-primitives-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;
diff --git a/cogl/cogl/cogl-journal.c b/cogl/cogl/cogl-journal.c
index d587b2ed1..e09fa2cf2 100644
--- a/cogl/cogl/cogl-journal.c
+++ b/cogl/cogl/cogl-journal.c
@@ -41,7 +41,6 @@
 #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>
diff --git a/cogl/cogl/cogl-pipeline.c b/cogl/cogl/cogl-pipeline.c
index 5dcc86bde..a79993d20 100644
--- a/cogl/cogl/cogl-pipeline.c
+++ b/cogl/cogl/cogl-pipeline.c
@@ -49,7 +49,6 @@
 #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>
diff --git a/cogl/cogl/cogl-primitives.c b/cogl/cogl/cogl-primitives.c
index 8726f87fe..b92486c49 100644
--- a/cogl/cogl/cogl-primitives.c
+++ b/cogl/cogl/cogl-primitives.c
@@ -42,7 +42,6 @@
 #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>
diff --git a/cogl/cogl/cogl-texture-2d-sliced.c b/cogl/cogl/cogl-texture-2d-sliced.c
index 6026949fd..7c5f8a251 100644
--- a/cogl/cogl/cogl-texture-2d-sliced.c
+++ b/cogl/cogl/cogl-texture-2d-sliced.c
@@ -52,8 +52,6 @@
 #include "cogl-primitive-texture.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>
diff --git a/cogl/cogl/cogl-texture-2d.c b/cogl/cogl/cogl-texture-2d.c
index 3d53a0ecd..a9a22acbb 100644
--- a/cogl/cogl/cogl-texture-2d.c
+++ b/cogl/cogl/cogl-texture-2d.c
@@ -44,7 +44,6 @@
 #include "cogl-framebuffer-private.h"
 #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
diff --git a/cogl/cogl/cogl.c b/cogl/cogl/cogl.c
index 19217f692..b44a08c0b 100644
--- a/cogl/cogl/cogl.c
+++ b/cogl/cogl/cogl.c
@@ -52,8 +52,6 @@
 #include "cogl-private.h"
 #include "cogl1-context.h"
 #include "cogl-offscreen.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"
 
diff --git a/cogl/cogl/winsys/cogl-texture-pixmap-x11.c b/cogl/cogl/winsys/cogl-texture-pixmap-x11.c
index b7dc2de9e..7b802d54f 100644
--- a/cogl/cogl/winsys/cogl-texture-pixmap-x11.c
+++ b/cogl/cogl/winsys/cogl-texture-pixmap-x11.c
@@ -51,7 +51,6 @@
 #include "cogl-xlib.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"
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]