[mutter] cogl: Move GLX-related headers into winsys/



commit 420fb28d3f5222534824329d07b866872cf2c2c7
Author: Adam Jackson <ajax redhat com>
Date:   Tue Dec 17 10:35:26 2019 -0500

    cogl: Move GLX-related headers into winsys/
    
    Makes it harder to accidentally include them from the core.
    
    https://gitlab.gnome.org/GNOME/mutter/merge_requests/977

 cogl/cogl/meson.build                              | 6 +++---
 cogl/cogl/{ => winsys}/cogl-glx-display-private.h  | 0
 cogl/cogl/{ => winsys}/cogl-glx-renderer-private.h | 0
 cogl/cogl/{ => winsys}/cogl-glx.h                  | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index 8fe6af1df..10f84aa7b 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -376,11 +376,11 @@ endif
 
 if have_glx
   cogl_nonintrospected_headers += [
-    'cogl-glx.h',
+    'winsys/cogl-glx.h',
   ]
   cogl_sources += [
-    'cogl-glx-display-private.h',
-    'cogl-glx-renderer-private.h',
+    'winsys/cogl-glx-display-private.h',
+    'winsys/cogl-glx-renderer-private.h',
     'winsys/cogl-winsys-glx-feature-functions.h',
     'winsys/cogl-winsys-glx-private.h',
     'winsys/cogl-winsys-glx.c',
diff --git a/cogl/cogl/cogl-glx-display-private.h b/cogl/cogl/winsys/cogl-glx-display-private.h
similarity index 100%
rename from cogl/cogl/cogl-glx-display-private.h
rename to cogl/cogl/winsys/cogl-glx-display-private.h
diff --git a/cogl/cogl/cogl-glx-renderer-private.h b/cogl/cogl/winsys/cogl-glx-renderer-private.h
similarity index 100%
rename from cogl/cogl/cogl-glx-renderer-private.h
rename to cogl/cogl/winsys/cogl-glx-renderer-private.h
diff --git a/cogl/cogl/cogl-glx.h b/cogl/cogl/winsys/cogl-glx.h
similarity index 100%
rename from cogl/cogl/cogl-glx.h
rename to cogl/cogl/winsys/cogl-glx.h


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