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.

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"
 

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;

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"
 

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"

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"

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

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);

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)

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 {

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 {

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;

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"
 

wscript_build.py

@@ -318,22 +318,22 @@ def build(ctx):
         ( "video/out/cocoa_common.m",            "cocoa" ),
         ( "video/out/dither.c" ),
         ( "video/out/filter_kernels.c" ),
-        ( "video/out/gl_cocoa.c",                "gl-cocoa" ),
-        ( "video/out/gl_common.c",               "gl" ),
-        ( "video/out/gl_rpi.c",                  "rpi" ),
-        ( "video/out/gl_hwdec.c",                "gl" ),
-        ( "video/out/gl_hwdec_dxva2.c",          "gl-win32" ),
-        ( "video/out/gl_hwdec_vaglx.c",          "vaapi-glx" ),
-        ( "video/out/gl_hwdec_vda.c",            "videotoolbox-vda-gl" ),
-        ( "video/out/gl_hwdec_vdpau.c",          "vdpau-gl-x11" ),
-        ( "video/out/gl_lcms.c",                 "gl" ),
-        ( "video/out/gl_osd.c",                  "gl" ),
-        ( "video/out/gl_utils.c",                "gl" ),
-        ( "video/out/gl_video.c",                "gl" ),
-        ( "video/out/gl_w32.c",                  "gl-win32" ),
-        ( "video/out/gl_wayland.c",              "gl-wayland" ),
-        ( "video/out/gl_x11.c",                  "gl-x11" ),
-        ( "video/out/gl_x11egl.c",               "egl-x11" ),
+        ( "video/out/opengl/gl_cocoa.c",         "gl-cocoa" ),
+        ( "video/out/opengl/gl_common.c",        "gl" ),
+        ( "video/out/opengl/gl_rpi.c",           "rpi" ),
+        ( "video/out/opengl/gl_hwdec.c",         "gl" ),
+        ( "video/out/opengl/gl_hwdec_dxva2.c",   "gl-win32" ),
+        ( "video/out/opengl/gl_hwdec_vaglx.c",   "vaapi-glx" ),
+        ( "video/out/opengl/gl_hwdec_vda.c",     "videotoolbox-vda-gl" ),
+        ( "video/out/opengl/gl_hwdec_vdpau.c",   "vdpau-gl-x11" ),
+        ( "video/out/opengl/gl_lcms.c",          "gl" ),
+        ( "video/out/opengl/gl_osd.c",           "gl" ),
+        ( "video/out/opengl/gl_utils.c",         "gl" ),
+        ( "video/out/opengl/gl_video.c",         "gl" ),
+        ( "video/out/opengl/gl_w32.c",           "gl-win32" ),
+        ( "video/out/opengl/gl_wayland.c",       "gl-wayland" ),
+        ( "video/out/opengl/gl_x11.c",           "gl-x11" ),
+        ( "video/out/opengl/gl_x11egl.c",        "egl-x11" ),
         ( "video/out/vo.c" ),
         ( "video/out/vo_caca.c",                 "caca" ),
         ( "video/out/vo_drm.c",                  "drm" ),