[spirv] Update external dependencies (#1286)

* ConstOffsets now requires ImageGatherExtended capability
* This reverts commit ea1bf8d24ceb05883b6e24517f6cbbb117d4a385.

external/GTestConfig.cmake

@@ -21,9 +21,6 @@ include_directories(
 
 if(WIN32)
   add_definitions(-DGTEST_OS_WINDOWS=1)
-  # GoogleTest uses std::tr1, which is deprecated in VS2017.
-  # The following is an escape-hatch macro to silence the deprecation warnings.
-  add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
 endif()
 
 if(SUPPORTS_VARIADIC_MACROS_FLAG)

external/SPIRV-Headers

@@ -1 +1 @@
-Subproject commit 8ae030235edffd199094fcbfb6d9eb02179685f7
+Subproject commit 3ce3e49d73b8abbf2ffe33f829f941fb2a40f552

external/SPIRV-Tools

@@ -1 +1 @@
-Subproject commit 0856997df6f6a53364b0f257824e12298871cefb
+Subproject commit af430ec822d63fe9e3448b0e57671e166e3ef01c

external/googletest

@@ -1 +1 @@
-Subproject commit dc043e1ca6bd509a92452ed54e817b6979869372
+Subproject commit 08d5b1f33af8c18785fb8ca02792b5fac81e248f

external/re2

@@ -1 +1 @@
-Subproject commit 71e6699778cebf99ed11e78e48b9370f79b9ea39
+Subproject commit 1c7eb5604bc46c0198fc7bc35b32985ffe57ca93

tools/clang/lib/SPIRV/ModuleBuilder.cpp

@@ -399,6 +399,7 @@ spv::ImageOperandsMask ModuleBuilder::composeImageOperandsMask(
 
   if (constOffsets) {
     mask = mask | ImageOperandsMask::ConstOffsets;
+    requireCapability(spv::Capability::ImageGatherExtended);
     orderedParams->push_back(constOffsets);
   }
 

tools/clang/test/CodeGenSPIRV/texture.array.gather-blue.hlsl

@@ -7,6 +7,7 @@ Texture2DArray<int3>    t2i3       : register(t2);
 TextureCubeArray<uint4> tCubeArray : register(t3);
 // .GatherBlue() does not support Texture1DArray.
 
+// CHECK: OpCapability ImageGatherExtended
 // CHECK: OpCapability SparseResidency
 
 // CHECK:      [[c12:%\d+]] = OpConstantComposite %v2int %int_1 %int_2

tools/clang/test/CodeGenSPIRV/texture.gather-alpha.hlsl

@@ -7,6 +7,7 @@ Texture2D<int4>    t2i4 : register(t2);
 TextureCube<uint4> tCube : register(t3);
 // .GatherAlpha() does not support Texture1D and Texture3D.
 
+// CHECK: OpCapability ImageGatherExtended
 // CHECK: OpCapability SparseResidency
 
 // CHECK:      [[c12:%\d+]] = OpConstantComposite %v2int %int_1 %int_2

tools/clang/test/CodeGenSPIRV/texture.gather-green.hlsl

@@ -7,6 +7,7 @@ Texture2D<uint2>  t2u2  : register(t2);
 TextureCube<int4> tCube : register(t3);
 // .GatherGreen() does not support Texture1D and Texture3D.
 
+// CHECK: OpCapability ImageGatherExtended
 // CHECK: OpCapability SparseResidency
 
 // CHECK:      [[c12:%\d+]] = OpConstantComposite %v2int %int_1 %int_2

tools/clang/unittests/SPIRV/CMakeLists.txt

@@ -21,11 +21,6 @@ add_clang_unittest(clang-spirv-tests
   WholeFileTestFixture.cpp
   )
 
-target_compile_definitions(clang-spirv-tests PRIVATE
-  # GoogleTest uses std::tr1, which is deprecated in VS2017.
-  # The following is an escape-hatch macro to silence the deprecation warnings.
-  -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
-
 target_link_libraries(clang-spirv-tests
   clangCodeGen
   clangFrontend