diff options
author | Niklas Haas <git@nand.wakku.to> | 2015-08-29 04:12:56 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-09-09 18:09:31 +0200 |
commit | 44eda2177d8facb1cd064c164b16e9027529d164 (patch) | |
tree | 7f3d77dd5aa4757fdd6e062cc6ff5613151afb3d /video/out/opengl | |
parent | deebc55014074fef121c1df6b117e9c0bf97d516 (diff) | |
download | mpv-44eda2177d8facb1cd064c164b16e9027529d164.tar.bz2 mpv-44eda2177d8facb1cd064c164b16e9027529d164.tar.xz |
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.
Diffstat (limited to 'video/out/opengl')
-rw-r--r-- | video/out/opengl/cocoa.c (renamed from video/out/opengl/gl_cocoa.c) | 2 | ||||
-rw-r--r-- | video/out/opengl/common.c (renamed from video/out/opengl/gl_common.c) | 2 | ||||
-rw-r--r-- | video/out/opengl/common.h (renamed from video/out/opengl/gl_common.h) | 2 | ||||
-rw-r--r-- | video/out/opengl/header_fixes.h (renamed from video/out/opengl/gl_header_fixes.h) | 0 | ||||
-rw-r--r-- | video/out/opengl/hwdec.c (renamed from video/out/opengl/gl_hwdec.c) | 2 | ||||
-rw-r--r-- | video/out/opengl/hwdec.h (renamed from video/out/opengl/gl_hwdec.h) | 2 | ||||
-rw-r--r-- | video/out/opengl/hwdec_dxva2.c (renamed from video/out/opengl/gl_hwdec_dxva2.c) | 4 | ||||
-rw-r--r-- | video/out/opengl/hwdec_vaglx.c (renamed from video/out/opengl/gl_hwdec_vaglx.c) | 2 | ||||
-rw-r--r-- | video/out/opengl/hwdec_vda.c (renamed from video/out/opengl/gl_hwdec_vda.c) | 2 | ||||
-rw-r--r-- | video/out/opengl/hwdec_vdpau.c (renamed from video/out/opengl/gl_hwdec_vdpau.c) | 4 | ||||
-rw-r--r-- | video/out/opengl/lcms.c (renamed from video/out/opengl/gl_lcms.c) | 4 | ||||
-rw-r--r-- | video/out/opengl/lcms.h (renamed from video/out/opengl/gl_lcms.h) | 0 | ||||
-rw-r--r-- | video/out/opengl/osd.c (renamed from video/out/opengl/gl_osd.c) | 4 | ||||
-rw-r--r-- | video/out/opengl/osd.h (renamed from video/out/opengl/gl_osd.h) | 2 | ||||
-rw-r--r-- | video/out/opengl/rpi.c (renamed from video/out/opengl/gl_rpi.c) | 4 | ||||
-rw-r--r-- | video/out/opengl/rpi.h (renamed from video/out/opengl/gl_rpi.h) | 0 | ||||
-rw-r--r-- | video/out/opengl/utils.c (renamed from video/out/opengl/gl_utils.c) | 2 | ||||
-rw-r--r-- | video/out/opengl/utils.h (renamed from video/out/opengl/gl_utils.h) | 2 | ||||
-rw-r--r-- | video/out/opengl/video.c (renamed from video/out/opengl/gl_video.c) | 10 | ||||
-rw-r--r-- | video/out/opengl/video.h (renamed from video/out/opengl/gl_video.h) | 2 | ||||
-rw-r--r-- | video/out/opengl/w32.c (renamed from video/out/opengl/gl_w32.c) | 2 | ||||
-rw-r--r-- | video/out/opengl/wayland.c (renamed from video/out/opengl/gl_wayland.c) | 2 | ||||
-rw-r--r-- | video/out/opengl/x11.c (renamed from video/out/opengl/gl_x11.c) | 4 | ||||
-rw-r--r-- | video/out/opengl/x11egl.c (renamed from video/out/opengl/gl_x11egl.c) | 2 |
24 files changed, 31 insertions, 31 deletions
diff --git a/video/out/opengl/gl_cocoa.c b/video/out/opengl/cocoa.c index 48ee2d3290..b3ca2854f3 100644 --- a/video/out/opengl/gl_cocoa.c +++ b/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; diff --git a/video/out/opengl/gl_common.c b/video/out/opengl/common.c index 2f78f11c08..6720e13f2a 100644 --- a/video/out/opengl/gl_common.c +++ b/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" diff --git a/video/out/opengl/gl_common.h b/video/out/opengl/common.h index 01fcc40dbd..083e2ca023 100644 --- a/video/out/opengl/gl_common.h +++ b/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; diff --git a/video/out/opengl/gl_header_fixes.h b/video/out/opengl/header_fixes.h index 6a5ce6ad09..6a5ce6ad09 100644 --- a/video/out/opengl/gl_header_fixes.h +++ b/video/out/opengl/header_fixes.h diff --git a/video/out/opengl/gl_hwdec.c b/video/out/opengl/hwdec.c index e5af2b70f4..ee602fa191 100644 --- a/video/out/opengl/gl_hwdec.c +++ b/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; diff --git a/video/out/opengl/gl_hwdec.h b/video/out/opengl/hwdec.h index f2b3fd5787..c48ec8b164 100644 --- a/video/out/opengl/gl_hwdec.h +++ b/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; diff --git a/video/out/opengl/gl_hwdec_dxva2.c b/video/out/opengl/hwdec_dxva2.c index 52a73de1b2..f6b3ac0e74 100644 --- a/video/out/opengl/gl_hwdec_dxva2.c +++ b/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" diff --git a/video/out/opengl/gl_hwdec_vaglx.c b/video/out/opengl/hwdec_vaglx.c index 4b3524c609..ad7496b9be 100644 --- a/video/out/opengl/gl_hwdec_vaglx.c +++ b/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 { diff --git a/video/out/opengl/gl_hwdec_vda.c b/video/out/opengl/hwdec_vda.c index 3fbcda0e79..271c8b7941 100644 --- a/video/out/opengl/gl_hwdec_vda.c +++ b/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; diff --git a/video/out/opengl/gl_hwdec_vdpau.c b/video/out/opengl/hwdec_vdpau.c index 851f79393d..ac1b7bef05 100644 --- a/video/out/opengl/gl_hwdec_vdpau.c +++ b/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" diff --git a/video/out/opengl/gl_lcms.c b/video/out/opengl/lcms.c index ec3013c553..469f2bc262 100644 --- a/video/out/opengl/gl_lcms.c +++ b/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" diff --git a/video/out/opengl/gl_lcms.h b/video/out/opengl/lcms.h index 5ad08b7d64..5ad08b7d64 100644 --- a/video/out/opengl/gl_lcms.h +++ b/video/out/opengl/lcms.h diff --git a/video/out/opengl/gl_osd.c b/video/out/opengl/osd.c index bf4d95efbd..1fe84e0d8b 100644 --- a/video/out/opengl/gl_osd.c +++ b/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; diff --git a/video/out/opengl/gl_osd.h b/video/out/opengl/osd.h index e00565aad7..bd47f71764 100644 --- a/video/out/opengl/gl_osd.h +++ b/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); diff --git a/video/out/opengl/gl_rpi.c b/video/out/opengl/rpi.c index aea71b85d7..7c486fc0b1 100644 --- a/video/out/opengl/gl_rpi.c +++ b/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) { diff --git a/video/out/opengl/gl_rpi.h b/video/out/opengl/rpi.h index e00762b632..e00762b632 100644 --- a/video/out/opengl/gl_rpi.h +++ b/video/out/opengl/rpi.h diff --git a/video/out/opengl/gl_utils.c b/video/out/opengl/utils.c index b88e04c6c0..ac9077fea8 100644 --- a/video/out/opengl/gl_utils.c +++ b/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) diff --git a/video/out/opengl/gl_utils.h b/video/out/opengl/utils.h index 1dfca78858..fae4e67a39 100644 --- a/video/out/opengl/gl_utils.h +++ b/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; diff --git a/video/out/opengl/gl_video.c b/video/out/opengl/video.c index f2c3bd45c0..c0c802c580 100644 --- a/video/out/opengl/gl_video.c +++ b/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" diff --git a/video/out/opengl/gl_video.h b/video/out/opengl/video.h index 443cb76787..a52f35c424 100644 --- a/video/out/opengl/gl_video.h +++ b/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; diff --git a/video/out/opengl/gl_w32.c b/video/out/opengl/w32.c index 0c1fed7bfa..78166be49b 100644 --- a/video/out/opengl/gl_w32.c +++ b/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); diff --git a/video/out/opengl/gl_wayland.c b/video/out/opengl/wayland.c index a67b97334b..2963ec8985 100644 --- a/video/out/opengl/gl_wayland.c +++ b/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) { diff --git a/video/out/opengl/gl_x11.c b/video/out/opengl/x11.c index 2eec57921b..eb7072dc4f 100644 --- a/video/out/opengl/gl_x11.c +++ b/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; diff --git a/video/out/opengl/gl_x11egl.c b/video/out/opengl/x11egl.c index b219ed11d1..fba40603fc 100644 --- a/video/out/opengl/gl_x11egl.c +++ b/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; |