Merge pull request #10623 from iwubcode/glslang

Externals: Update glslang to 11.9.0

Externals/glslang/.appveyor.yml

@@ -4,7 +4,7 @@
 # build version format
 version: "{build}"
 
-os: Visual Studio 2013
+os: Visual Studio 2015
 
 platform:
   - x64
@@ -17,6 +17,20 @@ branches:
   only:
     - master
 
+# changes to these files don't need to trigger testing
+skip_commits:
+  files:
+    - README.md
+    - README-spirv-remap.txt
+    - LICENSE.txt
+    - CODE_OF_CONDUCT.md
+    - BUILD.*
+    - WORKSPACE
+    - kokoro/*
+    - make-revision
+    - Android.mk
+    - _config.yml
+
 # Travis advances the master-tot tag to current top of the tree after
 # each push into the master branch, because it relies on that tag to
 # upload build artifacts to the master-tot release. This will cause
@@ -31,16 +45,17 @@ matrix:
 
 # scripts that run after cloning repository
 install:
-  - git clone https://github.com/google/googletest.git External/googletest
   - C:/Python27/python.exe update_glslang_sources.py
+  - set PATH=C:\ninja;C:\Python36;%PATH%
+  - git clone https://github.com/google/googletest.git External/googletest
 
 build:
   parallel: true  # enable MSBuild parallel builds
   verbosity: minimal
 
 build_script:
   - mkdir build && cd build
-  - cmake .. -DCMAKE_INSTALL_PREFIX=install
+  - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_INSTALL_PREFIX=install ..
   - cmake --build . --config %CONFIGURATION% --target install
 
 test_script:
@@ -60,10 +75,13 @@ after_test:
   # Zip all glslang artifacts for uploading and deploying
   - 7z a glslang-master-windows-"%PLATFORM%"-"%CONFIGURATION%".zip
     bin\glslangValidator.exe
+    bin\spirv-remap.exe
     include\glslang\*
-    include\SPIRV\*
+    lib\GenericCodeGen%SUFFIX%.lib
     lib\glslang%SUFFIX%.lib
+    lib\glslang-default-resource-limits%SUFFIX%.lib
     lib\HLSL%SUFFIX%.lib
+    lib\MachineIndependent%SUFFIX%.lib
     lib\OGLCompiler%SUFFIX%.lib
     lib\OSDependent%SUFFIX%.lib
     lib\SPIRV%SUFFIX%.lib
@@ -87,4 +105,4 @@ deploy:
     force_update: true
     on:
       branch: master
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015

Externals/glslang/.clang-format

@@ -1,7 +1,8 @@
 Language: Cpp
 IndentWidth: 4
+PointerAlignment: Left
 BreakBeforeBraces: Custom
-BraceWrapping: { AfterFunction: true, AfterControlStatement: true }
+BraceWrapping: { AfterFunction: true, AfterControlStatement: false }
 IndentCaseLabels: false
 ReflowComments: false
 ColumnLimit: 120

Externals/glslang/.gitattributes

@@ -8,10 +8,10 @@
 *.txt text
 
 # source code can be native and normalized, but simpler if lf everywhere; will try that way
-*.h text eof=lf
-*.c text eof=lf
-*.cpp text eof=lf
-*.y text eof=lf
-*.out text eof=lf
-*.conf text eof=lf
-*.err text eof=lf
+*.h text eol=lf
+*.c text eol=lf
+*.cpp text eol=lf
+*.y text eol=lf
+*.out text eol=lf
+*.conf text eol=lf
+*.err text eol=lf

Externals/glslang/.gitignore

@@ -2,9 +2,19 @@
 *.a
 *.so
 *.exe
+.vscode/
 tags
 TAGS
+bazel-*
 build/
 Test/localResults/
 External/googletest
 External/spirv-tools
+out/
+
+# GN generated files
+.cipd/
+*.gclient_entries
+third_party/
+buildtools/
+tools/

Externals/glslang/.travis.yml

@@ -48,25 +48,41 @@ install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CC" == "clang" ]]; then
       export CC=clang-3.6 CXX=clang++-3.6;
     fi
-  # Download Android NDK and Android CMake toolchain file.
+  # Download a recent Android NDK and use its android.toolchain.cmake file.
   - if [[ "$BUILD_NDK" == "ON" ]]; then
-      git clone --depth=1 https://github.com/urho3d/android-ndk.git $HOME/android-ndk;
       export ANDROID_NDK=$HOME/android-ndk;
-      git clone --depth=1 https://github.com/taka-no-me/android-cmake.git $HOME/android-cmake;
-      export TOOLCHAIN_PATH=$HOME/android-cmake/android.toolchain.cmake;
+      git init $ANDROID_NDK;
+      pushd $ANDROID_NDK;
+        git remote add dneto0 https://github.com/dneto0/android-ndk.git;
+        git fetch --depth=1 dneto0 r17b-strip;
+        git checkout FETCH_HEAD;
+      popd;
+      export TOOLCHAIN_PATH=$ANDROID_NDK/build/cmake/android.toolchain.cmake;
     fi
 
 before_script:
-  - git clone --depth=1 https://github.com/google/googletest.git External/googletest
+  # check out pre-breakage version of googletest; can be deleted when
+  # issue 3128 is fixed
+  # git clone --depth=1 https://github.com/google/googletest.git External/googletest
+  - mkdir -p External/googletest
+  - cd External/googletest
+  - git init
+  - git remote add origin https://github.com/google/googletest.git
+  - git fetch --depth 1 origin 0c400f67fcf305869c5fb113dd296eca266c9725
+  - git reset --hard FETCH_HEAD
+  - cd ../..
+  # get spirv-tools and spirv-headers
   - ./update_glslang_sources.py
 
 script:
   - mkdir build && cd build
   # For Android, do release building using NDK without testing.
+  # Use android-14, the oldest native API level supporeted by NDK r17b.
+  # We can use newer API levels if we want.
   # For Linux and macOS, do debug/release building with testing.
   - if [[ "$BUILD_NDK" == "ON" ]]; then
       cmake -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_PATH}
-            -DANDROID_NATIVE_API_LEVEL=android-12
+            -DANDROID_NATIVE_API_LEVEL=android-14
             -DCMAKE_BUILD_TYPE=Release
             -DANDROID_ABI="armeabi-v7a with NEON"
             -DBUILD_TESTING=OFF ..;
@@ -93,9 +109,11 @@ after_success:
       zip ${TARBALL}
         bin/glslangValidator
         include/glslang/*
-        include/SPIRV/*
+        lib/libGenericCodeGen${SUFFIX}.a
         lib/libglslang${SUFFIX}.a
+        lib/libglslang-default-resource-limits${SUFFIX}.a
         lib/libHLSL${SUFFIX}.a
+        lib/libMachineIndependent${SUFFIX}.a
         lib/libOGLCompiler${SUFFIX}.a
         lib/libOSDependent${SUFFIX}.a
         lib/libSPIRV${SUFFIX}.a

Externals/glslang/CMakeLists.txt

@@ -1,6 +1,13 @@
 set(SRCS
 	glslang/GenericCodeGen/CodeGen.cpp
 	glslang/GenericCodeGen/Link.cpp
+	#glslang/HLSL/hlslAttributes.cpp
+	#glslang/HLSL/hlslGrammar.cpp
+	#glslang/HLSL/hlslOpMap.cpp
+	#glslang/HLSL/hlslParseables.cpp
+	#glslang/HLSL/hlslParseHelper.cpp
+	#glslang/HLSL/hlslScanContext.cpp
+	#glslang/HLSL/hlslTokenStream.cpp
 	glslang/MachineIndependent/attribute.cpp
 	glslang/MachineIndependent/Constant.cpp
 	glslang/MachineIndependent/glslang_tab.cpp
@@ -26,6 +33,7 @@ set(SRCS
 	glslang/MachineIndependent/RemoveTree.cpp
 	glslang/MachineIndependent/Scan.cpp
 	glslang/MachineIndependent/ShaderLang.cpp
+	glslang/MachineIndependent/SpirvIntrinsics.cpp
 	glslang/MachineIndependent/SymbolTable.cpp
 	glslang/MachineIndependent/Versions.cpp
 	OGLCompilersDLL/InitializeDll.cpp
@@ -37,6 +45,7 @@ set(SRCS
 	SPIRV/SpvBuilder.cpp
 	SPIRV/SpvPostProcess.cpp
 	SPIRV/SPVRemapper.cpp
+	SPIRV/SpvTools.cpp
 	StandAlone/ResourceLimits.cpp
 )