From deebc55014074fef121c1df6b117e9c0bf97d516 Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Sat, 29 Aug 2015 01:10:30 +0200 Subject: [PATCH] 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 | 2 +- video/out/{ => opengl}/gl_common.c | 0 video/out/{ => opengl}/gl_common.h | 4 +-- video/out/{ => opengl}/gl_header_fixes.h | 0 video/out/{ => opengl}/gl_hwdec.c | 0 video/out/{ => opengl}/gl_hwdec.h | 0 video/out/{ => opengl}/gl_hwdec_dxva2.c | 0 video/out/{ => opengl}/gl_hwdec_vaglx.c | 2 +- video/out/{ => opengl}/gl_hwdec_vda.c | 0 video/out/{ => opengl}/gl_hwdec_vdpau.c | 0 video/out/{ => opengl}/gl_lcms.c | 0 video/out/{ => opengl}/gl_lcms.h | 0 video/out/{ => opengl}/gl_osd.c | 2 +- video/out/{ => opengl}/gl_osd.h | 0 video/out/{ => opengl}/gl_rpi.c | 2 +- video/out/{ => opengl}/gl_rpi.h | 0 video/out/{ => opengl}/gl_utils.c | 0 video/out/{ => opengl}/gl_utils.h | 0 video/out/{ => opengl}/gl_video.c | 10 ++++---- video/out/{ => opengl}/gl_video.h | 0 video/out/{ => opengl}/gl_w32.c | 2 +- video/out/{ => opengl}/gl_wayland.c | 2 +- video/out/{ => opengl}/gl_x11.c | 2 +- video/out/{ => opengl}/gl_x11egl.c | 2 +- video/out/vo_opengl.c | 12 ++++----- video/out/vo_opengl_cb.c | 6 ++--- wscript_build.py | 32 ++++++++++++------------ 27 files changed, 40 insertions(+), 40 deletions(-) rename video/out/{ => opengl}/gl_cocoa.c (99%) rename video/out/{ => opengl}/gl_common.c (100%) rename video/out/{ => opengl}/gl_common.h (99%) rename video/out/{ => opengl}/gl_header_fixes.h (100%) rename video/out/{ => opengl}/gl_hwdec.c (100%) rename video/out/{ => opengl}/gl_hwdec.h (100%) rename video/out/{ => opengl}/gl_hwdec_dxva2.c (100%) rename video/out/{ => opengl}/gl_hwdec_vaglx.c (99%) rename video/out/{ => opengl}/gl_hwdec_vda.c (100%) rename video/out/{ => opengl}/gl_hwdec_vdpau.c (100%) rename video/out/{ => opengl}/gl_lcms.c (100%) rename video/out/{ => opengl}/gl_lcms.h (100%) rename video/out/{ => opengl}/gl_osd.c (99%) rename video/out/{ => opengl}/gl_osd.h (100%) rename video/out/{ => opengl}/gl_rpi.c (99%) rename video/out/{ => opengl}/gl_rpi.h (100%) rename video/out/{ => opengl}/gl_utils.c (100%) rename video/out/{ => opengl}/gl_utils.h (100%) rename video/out/{ => opengl}/gl_video.c (99%) rename video/out/{ => opengl}/gl_video.h (100%) rename video/out/{ => opengl}/gl_w32.c (99%) rename video/out/{ => opengl}/gl_wayland.c (99%) rename video/out/{ => opengl}/gl_x11.c (99%) rename video/out/{ => opengl}/gl_x11egl.c (99%) diff --git a/video/out/gl_cocoa.c b/video/out/opengl/gl_cocoa.c similarity index 99% rename from video/out/gl_cocoa.c rename to 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 #include -#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 similarity index 100% rename from video/out/gl_common.c rename to video/out/opengl/gl_common.c diff --git a/video/out/gl_common.h b/video/out/opengl/gl_common.h similarity index 99% rename from video/out/gl_common.h rename to 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 similarity index 100% rename from video/out/gl_header_fixes.h rename to video/out/opengl/gl_header_fixes.h diff --git a/video/out/gl_hwdec.c b/video/out/opengl/gl_hwdec.c similarity index 100% rename from video/out/gl_hwdec.c rename to video/out/opengl/gl_hwdec.c diff --git a/video/out/gl_hwdec.h b/video/out/opengl/gl_hwdec.h similarity index 100% rename from video/out/gl_hwdec.h rename to video/out/opengl/gl_hwdec.h diff --git a/video/out/gl_hwdec_dxva2.c b/video/out/opengl/gl_hwdec_dxva2.c similarity index 100% rename from video/out/gl_hwdec_dxva2.c rename to video/out/opengl/gl_hwdec_dxva2.c diff --git a/video/out/gl_hwdec_vaglx.c b/video/out/opengl/gl_hwdec_vaglx.c similarity index 99% rename from video/out/gl_hwdec_vaglx.c rename to 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 -#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 similarity index 100% rename from video/out/gl_hwdec_vda.c rename to video/out/opengl/gl_hwdec_vda.c diff --git a/video/out/gl_hwdec_vdpau.c b/video/out/opengl/gl_hwdec_vdpau.c similarity index 100% rename from video/out/gl_hwdec_vdpau.c rename to video/out/opengl/gl_hwdec_vdpau.c diff --git a/video/out/gl_lcms.c b/video/out/opengl/gl_lcms.c similarity index 100% rename from video/out/gl_lcms.c rename to video/out/opengl/gl_lcms.c diff --git a/video/out/gl_lcms.h b/video/out/opengl/gl_lcms.h similarity index 100% rename from video/out/gl_lcms.h rename to video/out/opengl/gl_lcms.h diff --git a/video/out/gl_osd.c b/video/out/opengl/gl_osd.c similarity index 99% rename from video/out/gl_osd.c rename to 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 #include -#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 similarity index 100% rename from video/out/gl_osd.h rename to video/out/opengl/gl_osd.h diff --git a/video/out/gl_rpi.c b/video/out/opengl/gl_rpi.c similarity index 99% rename from video/out/gl_rpi.c rename to 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 #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 similarity index 100% rename from video/out/gl_rpi.h rename to video/out/opengl/gl_rpi.h diff --git a/video/out/gl_utils.c b/video/out/opengl/gl_utils.c similarity index 100% rename from video/out/gl_utils.c rename to video/out/opengl/gl_utils.c diff --git a/video/out/gl_utils.h b/video/out/opengl/gl_utils.h similarity index 100% rename from video/out/gl_utils.h rename to video/out/opengl/gl_utils.h diff --git a/video/out/gl_video.c b/video/out/opengl/gl_video.c similarity index 99% rename from video/out/gl_video.c rename to 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 similarity index 100% rename from video/out/gl_video.h rename to video/out/opengl/gl_video.h diff --git a/video/out/gl_w32.c b/video/out/opengl/gl_w32.c similarity index 99% rename from video/out/gl_w32.c rename to 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 #include -#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 similarity index 99% rename from video/out/gl_wayland.c rename to 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 . */ -#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 similarity index 99% rename from video/out/gl_x11.c rename to 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 similarity index 99% rename from video/out/gl_x11egl.c rename to 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 #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" diff --git a/wscript_build.py b/wscript_build.py index 87226107f7..93d25599b6 100644 --- a/wscript_build.py +++ b/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" ),