vo_opengl: move gl_* files to their own subdir

This is mainly just to keep things a bit more organized and separated
inside the codebase.

26 files changed, 24 insertions, 24 deletions

diff --git a/video/out/gl_cocoa.c b/video/out/opengl/gl_cocoa.c
index d04983ee50..48ee2d3290 100644
--- a/video/out/gl_cocoa.c
+++ b/video/out/opengl/gl_cocoa.c
@@ -22,7 +22,7 @@
 
 #include <OpenGL/OpenGL.h>
 #include <dlfcn.h>
-#include "cocoa_common.h"
+#include "video/out/cocoa_common.h"
 #include "osdep/macosx_versions.h"
 #include "gl_common.h"
 
diff --git a/video/out/gl_common.c b/video/out/opengl/gl_common.c
index 2f78f11c08..2f78f11c08 100644
--- a/video/out/gl_common.c
+++ b/video/out/opengl/gl_common.c
diff --git a/video/out/gl_common.h b/video/out/opengl/gl_common.h
index 50817090be..01fcc40dbd 100644
--- a/video/out/gl_common.h
+++ b/video/out/opengl/gl_common.h
@@ -31,7 +31,7 @@
 #include "common/msg.h"
 #include "misc/bstr.h"
 
-#include "vo.h"
+#include "video/out/vo.h"
 #include "video/csputils.h"
 
 #include "video/mp_image.h"
@@ -47,7 +47,7 @@
 #endif
 
 #define MP_GET_GL_WORKAROUNDS
-#include "video/out/gl_header_fixes.h"
+#include "gl_header_fixes.h"
 
 struct GL;
 typedef struct GL GL;
diff --git a/video/out/gl_header_fixes.h b/video/out/opengl/gl_header_fixes.h
index 6a5ce6ad09..6a5ce6ad09 100644
--- a/video/out/gl_header_fixes.h
+++ b/video/out/opengl/gl_header_fixes.h
diff --git a/video/out/gl_hwdec.c b/video/out/opengl/gl_hwdec.c
index e5af2b70f4..e5af2b70f4 100644
--- a/video/out/gl_hwdec.c
+++ b/video/out/opengl/gl_hwdec.c
diff --git a/video/out/gl_hwdec.h b/video/out/opengl/gl_hwdec.h
index f2b3fd5787..f2b3fd5787 100644
--- a/video/out/gl_hwdec.h
+++ b/video/out/opengl/gl_hwdec.h
diff --git a/video/out/gl_hwdec_dxva2.c b/video/out/opengl/gl_hwdec_dxva2.c
index 52a73de1b2..52a73de1b2 100644
--- a/video/out/gl_hwdec_dxva2.c
+++ b/video/out/opengl/gl_hwdec_dxva2.c
diff --git a/video/out/gl_hwdec_vaglx.c b/video/out/opengl/gl_hwdec_vaglx.c
index 00fecffb31..4b3524c609 100644
--- a/video/out/gl_hwdec_vaglx.c
+++ b/video/out/opengl/gl_hwdec_vaglx.c
@@ -23,7 +23,7 @@
 
 #include <GL/glx.h>
 
-#include "x11_common.h"
+#include "video/out/x11_common.h"
 #include "gl_hwdec.h"
 #include "video/vaapi.h"
 
diff --git a/video/out/gl_hwdec_vda.c b/video/out/opengl/gl_hwdec_vda.c
index 3fbcda0e79..3fbcda0e79 100644
--- a/video/out/gl_hwdec_vda.c
+++ b/video/out/opengl/gl_hwdec_vda.c
diff --git a/video/out/gl_hwdec_vdpau.c b/video/out/opengl/gl_hwdec_vdpau.c
index 851f79393d..851f79393d 100644
--- a/video/out/gl_hwdec_vdpau.c
+++ b/video/out/opengl/gl_hwdec_vdpau.c
diff --git a/video/out/gl_lcms.c b/video/out/opengl/gl_lcms.c
index ec3013c553..ec3013c553 100644
--- a/video/out/gl_lcms.c
+++ b/video/out/opengl/gl_lcms.c
diff --git a/video/out/gl_lcms.h b/video/out/opengl/gl_lcms.h
index 5ad08b7d64..5ad08b7d64 100644
--- a/video/out/gl_lcms.h
+++ b/video/out/opengl/gl_lcms.h
diff --git a/video/out/gl_osd.c b/video/out/opengl/gl_osd.c
index 0307904c25..bf4d95efbd 100644
--- a/video/out/gl_osd.c
+++ b/video/out/opengl/gl_osd.c
@@ -24,7 +24,7 @@
 #include <assert.h>
 #include <libavutil/common.h>
 
-#include "bitmap_packer.h"
+#include "video/out/bitmap_packer.h"
 
 #include "gl_utils.h"
 #include "gl_osd.h"
diff --git a/video/out/gl_osd.h b/video/out/opengl/gl_osd.h
index e00565aad7..e00565aad7 100644
--- a/video/out/gl_osd.h
+++ b/video/out/opengl/gl_osd.h
diff --git a/video/out/gl_rpi.c b/video/out/opengl/gl_rpi.c
index 9109662ef2..aea71b85d7 100644
--- a/video/out/gl_rpi.c
+++ b/video/out/opengl/gl_rpi.c
@@ -24,7 +24,7 @@
 #include <assert.h>
 
 #include "common/common.h"
-#include "x11_common.h"
+#include "video/out/x11_common.h"
 #include "gl_common.h"
 
 #include "gl_rpi.h"
diff --git a/video/out/gl_rpi.h b/video/out/opengl/gl_rpi.h
index e00762b632..e00762b632 100644
--- a/video/out/gl_rpi.h
+++ b/video/out/opengl/gl_rpi.h
diff --git a/video/out/gl_utils.c b/video/out/opengl/gl_utils.c
index b88e04c6c0..b88e04c6c0 100644
--- a/video/out/gl_utils.c
+++ b/video/out/opengl/gl_utils.c
diff --git a/video/out/gl_utils.h b/video/out/opengl/gl_utils.h
index 1dfca78858..1dfca78858 100644
--- a/video/out/gl_utils.h
+++ b/video/out/opengl/gl_utils.h
diff --git a/video/out/gl_video.c b/video/out/opengl/gl_video.c
index 364f4a2aa6..f2c3bd45c0 100644
--- a/video/out/gl_video.c
+++ b/video/out/opengl/gl_video.c
@@ -36,11 +36,11 @@
 #include "gl_utils.h"
 #include "gl_hwdec.h"
 #include "gl_osd.h"
-#include "filter_kernels.h"
-#include "aspect.h"
-#include "bitmap_packer.h"
-#include "dither.h"
-#include "vo.h"
+#include "video/out/filter_kernels.h"
+#include "video/out/aspect.h"
+#include "video/out/bitmap_packer.h"
+#include "video/out/dither.h"
+#include "video/out/vo.h"
 
 // Pixel width of 1D lookup textures.
 #define LOOKUP_TEXTURE_SIZE 256
diff --git a/video/out/gl_video.h b/video/out/opengl/gl_video.h
index 443cb76787..443cb76787 100644
--- a/video/out/gl_video.h
+++ b/video/out/opengl/gl_video.h
diff --git a/video/out/gl_w32.c b/video/out/opengl/gl_w32.c
index 87f98f117e..0c1fed7bfa 100644
--- a/video/out/gl_w32.c
+++ b/video/out/opengl/gl_w32.c
@@ -22,7 +22,7 @@
 
 #include <assert.h>
 #include <windows.h>
-#include "w32_common.h"
+#include "video/out/w32_common.h"
 #include "gl_common.h"
 
 typedef HRESULT (WINAPI *DwmFlush_t)(void);
diff --git a/video/out/gl_wayland.c b/video/out/opengl/gl_wayland.c
index a6a23bd180..a67b97334b 100644
--- a/video/out/gl_wayland.c
+++ b/video/out/opengl/gl_wayland.c
@@ -16,7 +16,7 @@
  * with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "wayland_common.h"
+#include "video/out/wayland_common.h"
 #include "gl_common.h"
 
 static void egl_resize(struct vo_wayland_state *wl)
diff --git a/video/out/gl_x11.c b/video/out/opengl/gl_x11.c
index 9226356b66..2eec57921b 100644
--- a/video/out/gl_x11.c
+++ b/video/out/opengl/gl_x11.c
@@ -26,7 +26,7 @@
 #define MP_GET_GLX_WORKAROUNDS
 #include "gl_header_fixes.h"
 
-#include "x11_common.h"
+#include "video/out/x11_common.h"
 #include "gl_common.h"
 
 struct glx_context {
diff --git a/video/out/gl_x11egl.c b/video/out/opengl/gl_x11egl.c
index c23ac70851..b219ed11d1 100644
--- a/video/out/gl_x11egl.c
+++ b/video/out/opengl/gl_x11egl.c
@@ -25,7 +25,7 @@
 #include <EGL/eglext.h>
 
 #include "common/common.h"
-#include "x11_common.h"
+#include "video/out/x11_common.h"
 #include "gl_common.h"
 
 struct priv {
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c
index 3985ac48a4..484800a986 100644
--- a/video/out/vo_opengl.c
+++ b/video/out/vo_opengl.c
@@ -42,14 +42,14 @@
 #include "video/mp_image.h"
 #include "sub/osd.h"
 
-#include "gl_common.h"
-#include "gl_utils.h"
-#include "gl_hwdec.h"
-#include "gl_osd.h"
+#include "opengl/gl_common.h"
+#include "opengl/gl_utils.h"
+#include "opengl/gl_hwdec.h"
+#include "opengl/gl_osd.h"
 #include "filter_kernels.h"
 #include "video/hwdec.h"
-#include "gl_video.h"
-#include "gl_lcms.h"
+#include "opengl/gl_video.h"
+#include "opengl/gl_lcms.h"
 
 struct gl_priv {
     struct vo *vo;
diff --git a/video/out/vo_opengl_cb.c b/video/out/vo_opengl_cb.c
index fe7ed86d75..ff1ab087a4 100644
--- a/video/out/vo_opengl_cb.c
+++ b/video/out/vo_opengl_cb.c
@@ -24,9 +24,9 @@
 #include "common/global.h"
 #include "player/client.h"
 
-#include "gl_common.h"
-#include "gl_video.h"
-#include "gl_hwdec.h"
+#include "opengl/gl_common.h"
+#include "opengl/gl_video.h"
+#include "opengl/gl_hwdec.h"
 
 #include "libmpv/opengl_cb.h"