SPV 1.4: Move to 1.4 validation, removing all 1.4 validation failures.

SPIRV/SpvTools.cpp

@@ -52,8 +52,21 @@ namespace glslang {
 spv_target_env MapToSpirvToolsEnv(const SpvVersion& spvVersion, spv::SpvBuildLogger* logger)
 {
     switch (spvVersion.vulkan) {
-    case glslang::EShTargetVulkan_1_0: return spv_target_env::SPV_ENV_VULKAN_1_0;
-    case glslang::EShTargetVulkan_1_1: return spv_target_env::SPV_ENV_VULKAN_1_1;
+    case glslang::EShTargetVulkan_1_0:
+        return spv_target_env::SPV_ENV_VULKAN_1_0;
+    case glslang::EShTargetVulkan_1_1:
+        switch (spvVersion.spv) {
+        case EShTargetSpv_1_0:
+        case EShTargetSpv_1_1:
+        case EShTargetSpv_1_2:
+        case EShTargetSpv_1_3:
+            return spv_target_env::SPV_ENV_VULKAN_1_1;
+        case EShTargetSpv_1_4:
+            return spv_target_env::SPV_ENV_VULKAN_1_1_SPIRV_1_4;
+        default:
+            logger->missingFunctionality("Target version for SPIRV-Tools validator");
+            return spv_target_env::SPV_ENV_VULKAN_1_1;
+        }
     default:
         break;
     }

Test/baseResults/spv.1.4.LoopControl.frag.out

@@ -2,7 +2,6 @@ spv.1.4.LoopControl.frag
 WARNING: 0:15: 'min_iterations' : expected a single integer argument 
 WARNING: 0:15: 'max_iterations' : expected a single integer argument 
 
-Validation failed
 // Module Version 10400
 // Generated by (magic number): 80007
 // Id's are bound by 54

Test/baseResults/spv.1.4.NonWritable.frag.out

 spv.1.4.NonWritable.frag
-Validation failed
 // Module Version 10400
 // Generated by (magic number): 80007
 // Id's are bound by 38

Test/baseResults/spv.1.4.OpCopyLogical.comp.out

 spv.1.4.OpCopyLogical.comp
-Validation failed
 // Module Version 10400
 // Generated by (magic number): 80007
 // Id's are bound by 65

Test/baseResults/spv.1.4.OpCopyLogical.funcall.frag.out

 spv.1.4.OpCopyLogical.funcall.frag
-Validation failed
 // Module Version 10400
 // Generated by (magic number): 80007
 // Id's are bound by 60

Test/baseResults/spv.1.4.OpCopyLogicalBool.comp.out

 spv.1.4.OpCopyLogicalBool.comp
-Validation failed
 // Module Version 10400
 // Generated by (magic number): 80007
 // Id's are bound by 135

Test/baseResults/spv.1.4.OpEntryPoint.frag.out

 spv.1.4.OpEntryPoint.frag
-Validation failed
 // Module Version 10400
 // Generated by (magic number): 80007
 // Id's are bound by 64

Test/baseResults/spv.1.4.OpSelect.frag.out

 spv.1.4.OpSelect.frag
-Validation failed
 // Module Version 10400
 // Generated by (magic number): 80007
 // Id's are bound by 98

Test/baseResults/spv.1.4.image.frag.out

 spv.1.4.image.frag
-Validation failed
 // Module Version 10400
 // Generated by (magic number): 80007
 // Id's are bound by 104

Test/baseResults/spv.1.4.sparseTexture.frag.out

 spv.1.4.sparseTexture.frag
-Validation failed
 // Module Version 10400
 // Generated by (magic number): 80007
 // Id's are bound by 213

Test/baseResults/spv.1.4.texture.frag.out

 spv.1.4.texture.frag
-Validation failed
 // Module Version 10400
 // Generated by (magic number): 80007
 // Id's are bound by 79