vo_opengl: remove gl_ prefixes from files in video/out/opengl

This is a bit redundant with the name of the directory itself, and not
in line with existing naming conventions.

video/out/opengl/cocoa.c

@@ -24,7 +24,7 @@
 #include <dlfcn.h>
 #include "video/out/cocoa_common.h"
 #include "osdep/macosx_versions.h"
-#include "gl_common.h"
+#include "common.h"
 
 struct cgl_context {
     CGLPixelFormatObj pix;

video/out/opengl/common.c

@@ -39,7 +39,7 @@
 #include <math.h>
 #include <assert.h>
 #include "talloc.h"
-#include "gl_common.h"
+#include "common.h"
 #include "common/common.h"
 #include "options/options.h"
 #include "options/m_option.h"

video/out/opengl/common.h

@@ -47,7 +47,7 @@
 #endif
 
 #define MP_GET_GL_WORKAROUNDS
-#include "gl_header_fixes.h"
+#include "header_fixes.h"
 
 struct GL;
 typedef struct GL GL;

video/out/opengl/hwdec.c

@@ -27,7 +27,7 @@
 
 #include "common/common.h"
 #include "common/msg.h"
-#include "gl_hwdec.h"
+#include "hwdec.h"
 
 extern const struct gl_hwdec_driver gl_hwdec_vaglx;
 extern const struct gl_hwdec_driver gl_hwdec_vda;

video/out/opengl/hwdec.h

@@ -1,7 +1,7 @@
 #ifndef MPGL_HWDEC_H_
 #define MPGL_HWDEC_H_
 
-#include "gl_common.h"
+#include "common.h"
 #include "video/hwdec.h"
 
 struct mp_hwdec_info;

video/out/opengl/hwdec_dxva2.c

@@ -1,7 +1,7 @@
 #include "common/common.h"
 
-#include "gl_hwdec.h"
-#include "gl_utils.h"
+#include "hwdec.h"
+#include "utils.h"
 #include "video/d3d.h"
 #include "video/hwdec.h"
 

video/out/opengl/hwdec_vaglx.c

@@ -24,7 +24,7 @@
 #include <GL/glx.h>
 
 #include "video/out/x11_common.h"
-#include "gl_hwdec.h"
+#include "hwdec.h"
 #include "video/vaapi.h"
 
 struct priv {

video/out/opengl/hwdec_vda.c

@@ -25,7 +25,7 @@
 #include <OpenGL/CGLIOSurface.h>
 
 #include "video/mp_image_pool.h"
-#include "gl_hwdec.h"
+#include "hwdec.h"
 
 struct vda_gl_plane_format {
     GLenum gl_format;

video/out/opengl/hwdec_vdpau.c

@@ -20,8 +20,8 @@
 
 #include <GL/glx.h>
 
-#include "gl_hwdec.h"
-#include "gl_utils.h"
+#include "hwdec.h"
+#include "utils.h"
 #include "video/vdpau.h"
 #include "video/vdpau_mixer.h"
 

video/out/opengl/lcms.c

@@ -33,8 +33,8 @@
 #include "options/m_option.h"
 #include "options/path.h"
 
-#include "gl_video.h"
-#include "gl_lcms.h"
+#include "video.h"
+#include "lcms.h"
 
 #include "osdep/io.h"
 

video/out/opengl/osd.c

@@ -26,8 +26,8 @@
 
 #include "video/out/bitmap_packer.h"
 
-#include "gl_utils.h"
-#include "gl_osd.h"
+#include "utils.h"
+#include "osd.h"
 
 struct osd_fmt_entry {
     GLint internal_format;

video/out/opengl/osd.h

@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <inttypes.h>
 
-#include "gl_utils.h"
+#include "utils.h"
 #include "sub/osd.h"
 
 struct mpgl_osd *mpgl_osd_init(GL *gl, struct mp_log *log, struct osd_state *osd);

video/out/opengl/rpi.c

@@ -25,9 +25,9 @@
 
 #include "common/common.h"
 #include "video/out/x11_common.h"
-#include "gl_common.h"
+#include "common.h"
 
-#include "gl_rpi.h"
+#include "rpi.h"
 
 static void *get_proc_address(const GLubyte *name)
 {

video/out/opengl/utils.c

@@ -30,7 +30,7 @@
 
 #include "stream/stream.h"
 #include "common/common.h"
-#include "gl_utils.h"
+#include "utils.h"
 
 // GLU has this as gluErrorString (we don't use GLU, as it is legacy-OpenGL)
 static const char *gl_error_to_string(GLenum error)

video/out/opengl/utils.h

@@ -24,7 +24,7 @@
 #ifndef MP_GL_UTILS_
 #define MP_GL_UTILS_
 
-#include "gl_common.h"
+#include "common.h"
 
 struct mp_log;
 

video/out/opengl/video.c

@@ -29,13 +29,13 @@
 #include <libavutil/common.h>
 #include <libavutil/lfg.h>
 
-#include "gl_video.h"
+#include "video.h"
 
 #include "misc/bstr.h"
-#include "gl_common.h"
-#include "gl_utils.h"
-#include "gl_hwdec.h"
-#include "gl_osd.h"
+#include "common.h"
+#include "utils.h"
+#include "hwdec.h"
+#include "osd.h"
 #include "video/out/filter_kernels.h"
 #include "video/out/aspect.h"
 #include "video/out/bitmap_packer.h"

video/out/opengl/video.h

@@ -21,7 +21,7 @@
 
 #include "options/m_option.h"
 #include "sub/osd.h"
-#include "gl_common.h"
+#include "common.h"
 
 struct lut3d {
     uint16_t *data;

video/out/opengl/w32.c

@@ -23,7 +23,7 @@
 #include <assert.h>
 #include <windows.h>
 #include "video/out/w32_common.h"
-#include "gl_common.h"
+#include "common.h"
 
 typedef HRESULT (WINAPI *DwmFlush_t)(void);
 

video/out/opengl/wayland.c

@@ -17,7 +17,7 @@
  */
 
 #include "video/out/wayland_common.h"
-#include "gl_common.h"
+#include "common.h"
 
 static void egl_resize(struct vo_wayland_state *wl)
 {

video/out/opengl/x11.c

@@ -24,10 +24,10 @@
 #include <GL/glx.h>
 
 #define MP_GET_GLX_WORKAROUNDS
-#include "gl_header_fixes.h"
+#include "header_fixes.h"
 
 #include "video/out/x11_common.h"
-#include "gl_common.h"
+#include "common.h"
 
 struct glx_context {
     XVisualInfo *vinfo;

video/out/opengl/x11egl.c

@@ -26,7 +26,7 @@
 
 #include "common/common.h"
 #include "video/out/x11_common.h"
-#include "gl_common.h"
+#include "common.h"
 
 struct priv {
     EGLDisplay egl_display;

video/out/vo_opengl.c

@@ -42,14 +42,14 @@
 #include "video/mp_image.h"
 #include "sub/osd.h"
 
-#include "opengl/gl_common.h"
-#include "opengl/gl_utils.h"
-#include "opengl/gl_hwdec.h"
-#include "opengl/gl_osd.h"
+#include "opengl/common.h"
+#include "opengl/utils.h"
+#include "opengl/hwdec.h"
+#include "opengl/osd.h"
 #include "filter_kernels.h"
 #include "video/hwdec.h"
-#include "opengl/gl_video.h"
-#include "opengl/gl_lcms.h"
+#include "opengl/video.h"
+#include "opengl/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 "opengl/gl_common.h"
-#include "opengl/gl_video.h"
-#include "opengl/gl_hwdec.h"
+#include "opengl/common.h"
+#include "opengl/video.h"
+#include "opengl/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/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/opengl/cocoa.c",            "gl-cocoa" ),
+        ( "video/out/opengl/common.c",           "gl" ),
+        ( "video/out/opengl/rpi.c",              "rpi" ),
+        ( "video/out/opengl/hwdec.c",            "gl" ),
+        ( "video/out/opengl/hwdec_dxva2.c",      "gl-win32" ),
+        ( "video/out/opengl/hwdec_vaglx.c",      "vaapi-glx" ),
+        ( "video/out/opengl/hwdec_vda.c",        "videotoolbox-vda-gl" ),
+        ( "video/out/opengl/hwdec_vdpau.c",      "vdpau-gl-x11" ),
+        ( "video/out/opengl/lcms.c",             "gl" ),
+        ( "video/out/opengl/osd.c",              "gl" ),
+        ( "video/out/opengl/utils.c",            "gl" ),
+        ( "video/out/opengl/video.c",            "gl" ),
+        ( "video/out/opengl/w32.c",              "gl-win32" ),
+        ( "video/out/opengl/wayland.c",          "gl-wayland" ),
+        ( "video/out/opengl/x11.c",              "gl-x11" ),
+        ( "video/out/opengl/x11egl.c",           "egl-x11" ),
         ( "video/out/vo.c" ),
         ( "video/out/vo_caca.c",                 "caca" ),
         ( "video/out/vo_drm.c",                  "drm" ),