diff options
| author | James Ross-Gowan <rossy@jrg.systems> | 2019-04-16 18:18:50 +1000 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2019-06-12 23:03:55 +0300 |
| commit | cc38035841692780883f9cec274617108c57670c (patch) | |
| tree | 7b7fcf6bfa9b15d4a044a21d77b507a91e3db7da /TOOLS | |
| parent | fbe267150d9b6a2486a73c13d58b2b24d69b50ad (diff) | |
| download | mpv-cc38035841692780883f9cec274617108c57670c.tar.bz2 mpv-cc38035841692780883f9cec274617108c57670c.tar.xz | |
vo_gpu: d3d11: use the SPIRV-Cross C API directly
When the D3D11 backend was first written, SPIRV-Cross only had a C++ API
and no guarantee of API or ABI stability, so instead of using
SPIRV-Cross directly, mpv used an unofficial C wrapper called crossc.
Now that KhronosGroup/SPIRV-Cross#611 is resolved, SPIRV-Cross has an
official C API that can be used instead, so remove crossc and use
SPIRV-Cross directly.
Diffstat (limited to 'TOOLS')
| -rwxr-xr-x | TOOLS/appveyor-build.sh | 2 | ||||
| -rwxr-xr-x | TOOLS/appveyor-install.sh | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/TOOLS/appveyor-build.sh b/TOOLS/appveyor-build.sh index 8796118df3..0c3aaacedd 100755 --- a/TOOLS/appveyor-build.sh +++ b/TOOLS/appveyor-build.sh @@ -11,7 +11,7 @@ export PYTHON=/usr/bin/python3 "$PYTHON" waf configure \ --check-c-compiler=gcc \ --disable-egl-angle-lib \ - --enable-crossc \ + --enable-spirv-cross \ --enable-d3d-hwaccel \ --enable-d3d11 \ --enable-egl-angle \ diff --git a/TOOLS/appveyor-install.sh b/TOOLS/appveyor-install.sh index 28e0674581..15595facf0 100755 --- a/TOOLS/appveyor-install.sh +++ b/TOOLS/appveyor-install.sh @@ -62,10 +62,11 @@ pacman -Sc --noconfirm ninja install ) -# Compile crossc +# Compile SPIRV-Cross ( - git clone --depth=1 https://github.com/rossy/crossc && cd crossc - git submodule update --init + git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Cross && cd SPIRV-Cross - make -j4 install prefix=$MINGW_PREFIX + mkdir build && cd build + cmake -GNinja -DSPIRV_CROSS_SHARED=ON -DCMAKE_INSTALL_PREFIX=$MINGW_PREFIX .. + ninja install ) |