cube: Use working url to fetch glslang binaries
authorTony-LunarG <tony@lunarg.com>
Mon, 17 Sep 2018 17:34:24 +0000 (11:34 -0600)
committerTony Barbour <tony@lunarg.com>
Mon, 17 Sep 2018 21:52:47 +0000 (15:52 -0600)
Change-Id: I6157cf2210c1249ce9a6bcf0ed6279597b16a53f

.appveyor.yml
.travis.yml
scripts/fetch_glslangvalidator.py

index f94d814..281eb2e 100644 (file)
@@ -24,15 +24,6 @@ branches:
 
 before_build:
   - "SET PATH=C:\\Python35;C:\\Python35\\Scripts;%PATH%"
-  # Get a prebuilt shader compiler (glslangValidator) so that we don't have to build all of glslang
-  - mkdir glslang
-  - cd glslang
-  - curl -fsSL -o glslang-master-windows-x64-Release.zip https://github.com/KhronosGroup/glslang/releases/download/master-tot/glslang-master-windows-x64-Release.zip
-  - 7z x glslang-master-windows-x64-Release.zip
-  - cd ..
-  - "SET PATH=%APPVEYOR_BUILD_FOLDER%\\glslang\\bin;%PATH%"
-  - glslangValidator.exe --version
-  - echo.
   - echo Starting build for %APPVEYOR_REPO_NAME% in %APPVEYOR_BUILD_FOLDER%
   # Build Vulkan-Headers
   - echo Building Vulkan-Headers for %PLATFORM% %CONFIGURATION%
index e2132dc..55751a9 100644 (file)
@@ -46,14 +46,6 @@ before_install:
       # Install the appropriate Linux packages.
       sudo apt-get -qq update
       sudo apt-get -y install libxkbcommon-dev libwayland-dev libmirclient-dev libxrandr-dev libx11-xcb-dev
-      # Get a prebuilt shader compiler (glslangValidator) so that we don't have to build all of glslang
-      mkdir glslang
-      cd glslang
-      wget https://github.com/KhronosGroup/glslang/releases/download/master-tot/glslang-master-linux-Release.zip
-      unzip -u -q glslang-master-linux-Release.zip
-      cd ..
-      export PATH=${TRAVIS_BUILD_DIR}/glslang/bin:$PATH
-      glslangValidator --version
     fi
   - |
     if [[ "$VULKAN_BUILD_TARGET" == "ANDROID" ]]; then
index 5da8a67..d5a07be 100755 (executable)
@@ -35,7 +35,7 @@ import zipfile
 
 SCRIPTS_DIR = os.path.dirname(os.path.abspath(__file__))
 REPO_DIR = os.path.join(SCRIPTS_DIR, '..')
-GLSLANG_URL = "https://github.com/KhronosGroup/glslang/releases/download/master-tot"
+GLSLANG_URL = "https://github.com/KhronosGroup/glslang/releases/download/7.9.2888"
 
 if __name__ == '__main__':
     if len(sys.argv) != 2: