From: Lei Zhang <antiagainst@google.com>
Date: Mon, 18 Jul 2016 15:01:36 +0000 (-0400)
Subject: Track changes in SPIRV-Headers for SPIR-V 1.1 rev 2.
X-Git-Tag: upstream/2018.6~1196
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a9385bbd0e6eae188c14302cf37c415ecc8b698;p=platform%2Fupstream%2FSPIRV-Tools.git

Track changes in SPIRV-Headers for SPIR-V 1.1 rev 2.

* The `Input` StorageClass doesn't require the `Shader` capability
  anymore.
* The `Sampled1D` and `SampledBuffer` capabilities don't require
  the `Shader` capability anymore. So they do not indirectly
  depend on the `Matrix` capability. So are the `Image1D` and
  `ImageBuffer` capabilities, which depend on `Sampled1D` and
  `SampledBuffer`.

A new GLSL grammar file is uploaded for SPIR-V 1.1, but it's the
same as the existing one for SPIR-V 1.0.

Now tracking commit 3814effb879ab5a98a7b9288a4b4c7849d2bc8ac in
SPIRV-Headers.
---

diff --git a/test/OperandCapabilities.cpp b/test/OperandCapabilities.cpp
index a20f730..3059b4d 100644
--- a/test/OperandCapabilities.cpp
+++ b/test/OperandCapabilities.cpp
@@ -171,7 +171,6 @@ INSTANTIATE_TEST_CASE_P(
     Combine(Values(SPV_ENV_UNIVERSAL_1_0, SPV_ENV_UNIVERSAL_1_1),
             ValuesIn(std::vector<EnumCapabilityCase>{
                 CASE0(STORAGE_CLASS, StorageClassUniformConstant),
-                CASE1(STORAGE_CLASS, StorageClassInput, Shader),
                 CASE1(STORAGE_CLASS, StorageClassUniform, Shader),
                 CASE1(STORAGE_CLASS, StorageClassOutput, Shader),
                 CASE0(STORAGE_CLASS, StorageClassWorkgroup),
@@ -690,10 +689,8 @@ INSTANTIATE_TEST_CASE_P(
             CASE1(CAPABILITY, CapabilityInputAttachment, Shader),
             CASE1(CAPABILITY, CapabilitySparseResidency, Shader),
             CASE1(CAPABILITY, CapabilityMinLod, Shader),
-            CASE1(CAPABILITY, CapabilitySampled1D, Shader),
             CASE1(CAPABILITY, CapabilityImage1D, Sampled1D),
             CASE1(CAPABILITY, CapabilitySampledCubeArray, Shader),
-            CASE1(CAPABILITY, CapabilitySampledBuffer, Shader),
             CASE1(CAPABILITY, CapabilityImageBuffer, SampledBuffer),
             CASE1(CAPABILITY, CapabilityImageMSArray, Shader),
             CASE1(CAPABILITY, CapabilityStorageImageExtendedFormats, Shader),
diff --git a/test/Validate.Capability.cpp b/test/Validate.Capability.cpp
index 5083a12..769f646 100644
--- a/test/Validate.Capability.cpp
+++ b/test/Validate.Capability.cpp
@@ -284,12 +284,8 @@ const vector<string>& MatrixDependencies() {
   "InputAttachment",
   "SparseResidency",
   "MinLod",
-  "Sampled1D",
-  "Image1D",
   "SampledCubeArray",
-  "SampledBuffer",
   "ImageMSArray",
-  "ImageBuffer",
   "StorageImageExtendedFormats",
   "ImageQuery",
   "DerivativeControl",
@@ -325,12 +321,8 @@ const vector<string>& ShaderDependencies() {
   "InputAttachment",
   "SparseResidency",
   "MinLod",
-  "Sampled1D",
-  "Image1D",
   "SampledCubeArray",
-  "SampledBuffer",
   "ImageMSArray",
-  "ImageBuffer",
   "StorageImageExtendedFormats",
   "ImageQuery",
   "DerivativeControl",
@@ -651,7 +643,7 @@ make_pair(string(kGLSL450MemoryModel) +
 make_pair(string(kOpenCLMemoryModel) +
           " %intt = OpTypeInt 32 0\n"
           " %ptrt = OpTypePointer Input %intt"
-          " %var = OpVariable %ptrt Input\n", ShaderDependencies()),
+          " %var = OpVariable %ptrt Input\n", AllCapabilities()),
 make_pair(string(kOpenCLMemoryModel) +
           " %intt = OpTypeInt 32 0\n"
           " %ptrt = OpTypePointer Uniform %intt\n"
@@ -1155,8 +1147,6 @@ bool Exists(const std::string& capability, spv_target_env env) {
                             capability.size(), &dummy);
 }
 
-
-
 TEST_P(ValidateCapability, Capability) {
   const string capability = Capability(GetParam());
   spv_target_env env =