summaryrefslogtreecommitdiffstats
path: root/wscript_build.py
diff options
context:
space:
mode:
authorNiklas Haas <git@haasn.xyz>2017-09-14 08:04:55 +0200
committerNiklas Haas <git@haasn.xyz>2017-09-21 15:00:55 +0200
commit65979986a923a8f08019b257c3fe72cd5e8ecf68 (patch)
treeb8f4b8c17d583594aef0ca509064f8b2ff7128d4 /wscript_build.py
parent20f958c9775652c3213588c2a0824f5353276adc (diff)
downloadmpv-65979986a923a8f08019b257c3fe72cd5e8ecf68.tar.bz2
mpv-65979986a923a8f08019b257c3fe72cd5e8ecf68.tar.xz
vo_opengl: refactor into vo_gpu
This is done in several steps: 1. refactor MPGLContext -> struct ra_ctx 2. move GL-specific stuff in vo_opengl into opengl/context.c 3. generalize context creation to support other APIs, and add --gpu-api 4. rename all of the --opengl- options that are no longer opengl-specific 5. move all of the stuff from opengl/* that isn't GL-specific into gpu/ (note: opengl/gl_utils.h became opengl/utils.h) 6. rename vo_opengl to vo_gpu 7. to handle window screenshots, the short-term approach was to just add it to ra_swchain_fns. Long term (and for vulkan) this has to be moved to ra itself (and vo_gpu altered to compensate), but this was a stop-gap measure to prevent this commit from getting too big 8. move ra->fns->flush to ra_gl_ctx instead 9. some other minor changes that I've probably already forgotten Note: This is one half of a major refactor, the other half of which is provided by rossy's following commit. This commit enables support for all linux platforms, while his version enables support for all non-linux platforms. Note 2: vo_opengl_cb.c also re-uses ra_gl_ctx so it benefits from the --opengl- options like --opengl-early-flush, --opengl-finish etc. Should be a strict superset of the old functionality. Disclaimer: Since I have no way of compiling mpv on all platforms, some of these ports were done blindly. Specifically, the blind ports included context_mali_fbdev.c and context_rpi.c. Since they're both based on egl_helpers, the port should have gone smoothly without any major changes required. But if somebody complains about a compile error on those platforms (assuming anybody actually uses them), you know where to complain.
Diffstat (limited to 'wscript_build.py')
-rw-r--r--wscript_build.py47
1 files changed, 24 insertions, 23 deletions
diff --git a/wscript_build.py b/wscript_build.py
index 2f6c08bc0a..8dab6012c0 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -385,45 +385,46 @@ def build(ctx):
( "video/out/dither.c" ),
( "video/out/filter_kernels.c" ),
( "video/out/opengl/angle_dynamic.c", "egl-angle" ),
+ ( "video/out/gpu/context.c", "gpu" ),
+ ( "video/out/gpu/hwdec.c", "gpu" ),
+ ( "video/out/gpu/lcms.c", "gpu" ),
+ ( "video/out/gpu/osd.c", "gpu" ),
+ ( "video/out/gpu/ra.c", "gpu" ),
+ ( "video/out/gpu/shader_cache.c", "gpu" ),
+ ( "video/out/gpu/user_shaders.c", "gpu" ),
+ ( "video/out/gpu/utils.c", "gpu" ),
+ ( "video/out/gpu/video.c", "gpu" ),
+ ( "video/out/gpu/video_shaders.c", "gpu" ),
( "video/out/opengl/common.c", "gl" ),
+ ( "video/out/opengl/formats.c", "gl" ),
+ ( "video/out/opengl/utils.c", "gl" ),
+ ( "video/out/opengl/ra_gl.c", "gl" ),
( "video/out/opengl/context.c", "gl" ),
- ( "video/out/opengl/context_angle.c", "egl-angle-win32" ),
- ( "video/out/opengl/context_cocoa.c", "gl-cocoa" ),
+# ( "video/out/opengl/context_angle.c", "egl-angle-win32" ),
+# ( "video/out/opengl/context_cocoa.c", "gl-cocoa" ),
( "video/out/opengl/context_drm_egl.c", "egl-drm" ),
- ( "video/out/opengl/context_dxinterop.c","gl-dxinterop" ),
+# ( "video/out/opengl/context_dxinterop.c","gl-dxinterop" ),
( "video/out/opengl/context_mali_fbdev.c","mali-fbdev" ),
( "video/out/opengl/context_rpi.c", "rpi" ),
( "video/out/opengl/context_vdpau.c", "vdpau-gl-x11" ),
( "video/out/opengl/context_wayland.c", "gl-wayland" ),
- ( "video/out/opengl/context_w32.c", "gl-win32" ),
- ( "video/out/opengl/context_x11.c", "gl-x11" ),
+# ( "video/out/opengl/context_w32.c", "gl-win32" ),
+ ( "video/out/opengl/context_glx.c", "gl-x11" ),
( "video/out/opengl/context_x11egl.c", "egl-x11" ),
( "video/out/opengl/cuda_dynamic.c", "cuda-hwaccel" ),
- ( "video/out/opengl/d3d11_helpers.c", "egl-angle-win32" ),
+# ( "video/out/opengl/d3d11_helpers.c", "egl-angle-win32" ),
( "video/out/opengl/egl_helpers.c", "egl-helpers" ),
- ( "video/out/opengl/formats.c", "gl" ),
- ( "video/out/opengl/gl_utils.c", "gl" ),
- ( "video/out/opengl/hwdec.c", "gl" ),
( "video/out/opengl/hwdec_cuda.c", "cuda-hwaccel" ),
- ( "video/out/opengl/hwdec_d3d11egl.c", "d3d-hwaccel" ),
- ( "video/out/opengl/hwdec_d3d11eglrgb.c","d3d-hwaccel" ),
- ( "video/out/opengl/hwdec_dxva2gldx.c", "gl-dxinterop-d3d9" ),
- ( "video/out/opengl/hwdec_dxva2egl.c", "d3d9-hwaccel" ),
+# ( "video/out/opengl/hwdec_d3d11egl.c", "d3d-hwaccel" ),
+# ( "video/out/opengl/hwdec_d3d11eglrgb.c","d3d-hwaccel" ),
+# ( "video/out/opengl/hwdec_dxva2gldx.c", "gl-dxinterop-d3d9" ),
+# ( "video/out/opengl/hwdec_dxva2egl.c", "d3d9-hwaccel" ),
( "video/out/opengl/hwdec_osx.c", "videotoolbox-gl" ),
( "video/out/opengl/hwdec_ios.m", "ios-gl" ),
( "video/out/opengl/hwdec_rpi.c", "rpi" ),
( "video/out/opengl/hwdec_vaegl.c", "vaapi-egl" ),
( "video/out/opengl/hwdec_vaglx.c", "vaapi-glx" ),
( "video/out/opengl/hwdec_vdpau.c", "vdpau-gl-x11" ),
- ( "video/out/opengl/lcms.c", "gl" ),
- ( "video/out/opengl/osd.c", "gl" ),
- ( "video/out/opengl/ra.c", "gl" ),
- ( "video/out/opengl/ra_gl.c", "gl" ),
- ( "video/out/opengl/shader_cache.c", "gl" ),
- ( "video/out/opengl/user_shaders.c", "gl" ),
- ( "video/out/opengl/utils.c", "gl" ),
- ( "video/out/opengl/video.c", "gl" ),
- ( "video/out/opengl/video_shaders.c", "gl" ),
( "video/out/vo.c" ),
( "video/out/vo_caca.c", "caca" ),
( "video/out/vo_drm.c", "drm" ),
@@ -432,7 +433,7 @@ def build(ctx):
( "video/out/vo_lavc.c", "encoding" ),
( "video/out/vo_rpi.c", "rpi" ),
( "video/out/vo_null.c" ),
- ( "video/out/vo_opengl.c", "gl" ),
+ ( "video/out/vo_gpu.c", "gpu" ),
( "video/out/vo_opengl_cb.c", "gl" ),
( "video/out/vo_sdl.c", "sdl2" ),
( "video/out/vo_tct.c" ),