From d5c879e8e710b987685a3ae7697fb4b3cdca6cc8 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Fri, 12 Jan 2018 22:19:03 +0300 Subject: [PATCH] update vulkan submodules --- .travis.yml | 10 +++++----- Vulkan/Vulkan-LoaderAndValidationLayers | 2 +- Vulkan/Vulkan-build/Vulkan-build.vcxproj | 12 ++++++++---- Vulkan/Vulkan-build/pre-build.bat | 13 +++++++++++++ Vulkan/glslang | 2 +- appveyor.yml | 2 +- 6 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 Vulkan/Vulkan-build/pre-build.bat diff --git a/.travis.yml b/.travis.yml index 299efd864e..00b9e054aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,11 +41,11 @@ before_install: # Install updated libglew-dev since the version provided by trusty is outdated - if [ "$TRAVIS_OS_NAME" = "linux" ]; then - wget http://mirrors.kernel.org/ubuntu/pool/main/g/glew/libglew-dev_1.13.0-2_amd64.deb; - wget http://mirrors.kernel.org/ubuntu/pool/main/g/glew/libglew1.13_1.13.0-2_amd64.deb; - wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan1_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb; - wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan-dev_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb; - sudo dpkg -i libglew1.13_1.13.0-2_amd64.deb libglew-dev_1.13.0-2_amd64.deb libvulkan1_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb libvulkan-dev_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb; + wget http://mirrors.kernel.org/ubuntu/pool/main/g/glew/libglew-dev_2.0.0-3_amd64.deb; + wget http://mirrors.kernel.org/ubuntu/pool/main/g/glew/libglew2.0_2.0.0-3_amd64.deb; + wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan1_1.0.61.1+dfsg1-1ubuntu1~16.04.1_amd64.deb; + wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan-dev_1.0.61.1+dfsg1-1ubuntu1~16.04.1_amd64.deb; + sudo dpkg -i libglew2.0_2.0.0-3_amd64.deb libglew-dev_2.0.0-3_amd64.deb libvulkan1_1.0.61.1+dfsg1-1ubuntu1~16.04.1_amd64.deb libvulkan-dev_1.0.61.1+dfsg1-1ubuntu1~16.04.1_amd64.deb; else brew update; brew install ccache glew llvm40; diff --git a/Vulkan/Vulkan-LoaderAndValidationLayers b/Vulkan/Vulkan-LoaderAndValidationLayers index 85926a33d4..28d93dfc0f 160000 --- a/Vulkan/Vulkan-LoaderAndValidationLayers +++ b/Vulkan/Vulkan-LoaderAndValidationLayers @@ -1 +1 @@ -Subproject commit 85926a33d427ee62f395a50886db980127063c72 +Subproject commit 28d93dfc0f24d65237fd773d74a284bf6e399222 diff --git a/Vulkan/Vulkan-build/Vulkan-build.vcxproj b/Vulkan/Vulkan-build/Vulkan-build.vcxproj index 50850770b1..d2306790e8 100644 --- a/Vulkan/Vulkan-build/Vulkan-build.vcxproj +++ b/Vulkan/Vulkan-build/Vulkan-build.vcxproj @@ -39,18 +39,22 @@ - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers + start /W /B pre-build.bat +cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Release /m cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /m - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers + start /W /B pre-build.bat +cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /m - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers + start /W /B pre-build.bat +cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /m - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers + start /W /B pre-build.bat +cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /m cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /m diff --git a/Vulkan/Vulkan-build/pre-build.bat b/Vulkan/Vulkan-build/pre-build.bat new file mode 100644 index 0000000000..a9de5dd443 --- /dev/null +++ b/Vulkan/Vulkan-build/pre-build.bat @@ -0,0 +1,13 @@ +@ECHO OFF + +REM Setting up dummy git helper +MKDIR ..\Vulkan-LoaderAndValidationLayers\external\glslang\External\spirv-tools +SET header="@ECHO off" +SET content="ECHO unused" +ECHO %header:"=% > git.bat +ECHO %content:"=% >> git.bat +COPY /Y git.bat ..\Vulkan-LoaderAndValidationLayers\external\glslang\External\spirv-tools\git.bat + +REM Set up gitignore +SET ignored="*" +ECHO %ignored:"=% > ..\Vulkan-LoaderAndValidationLayers\external\glslang\External\spirv-tools\.gitignore \ No newline at end of file diff --git a/Vulkan/glslang b/Vulkan/glslang index cf571f7310..e22e347395 160000 --- a/Vulkan/glslang +++ b/Vulkan/glslang @@ -1 +1 @@ -Subproject commit cf571f7310f58e6eb4ea35600ef1401bc76db0d2 +Subproject commit e22e3473958e9bf3536f6c2133d66e5808816b78 diff --git a/appveyor.yml b/appveyor.yml index a66316f069..c75759ea54 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -51,7 +51,7 @@ before_build: - set PATH=%PATH%;%QTDIR% - if not exist llvmlibs.7z appveyor DownloadFile "https://drive.google.com/uc?export=download&id=0B8A6NaxhQAGRY2k3Q2Yya05lcm8" -FileName llvmlibs.7z - 7z x llvmlibs.7z -aos -o%APPVEYOR_BUILD_FOLDER% > null - - if not exist vulkan.7z appveyor DownloadFile "https://drive.google.com/uc?export=download&id=0B8A6NaxhQAGRaHYxV3VOS2d0a0U" -FileName vulkan.7z + - if not exist vulkan.7z appveyor DownloadFile "https://drive.google.com/uc?export=download&id=1A2eOMmCO714i0U7J0qI4aEMKnuWl8l_R" -FileName vulkan.7z - 7z x vulkan.7z -aos -o"%APPVEYOR_BUILD_FOLDER%\lib\%CONFIGURATION%-%PLATFORM%" > null # scripts to run *after* solution is built and *before* automatic packaging occurs (web apps, NuGet packages, Azure Cloud Services)