Sfoglia il codice sorgente

Update to latest SPIRV-Tools, supporting Vulkan 1.2.

John Kessenich 5 anni fa
parent
commit
c3bb5d6914
2 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 1 1
      SPIRV/SpvTools.cpp
  2. 1 1
      known_good.json

+ 1 - 1
SPIRV/SpvTools.cpp

@@ -68,7 +68,7 @@ spv_target_env MapToSpirvToolsEnv(const SpvVersion& spvVersion, spv::SpvBuildLog
             return spv_target_env::SPV_ENV_VULKAN_1_1;
             return spv_target_env::SPV_ENV_VULKAN_1_1;
         }
         }
     case glslang::EShTargetVulkan_1_2:
     case glslang::EShTargetVulkan_1_2:
-        return spv_target_env::SPV_ENV_UNIVERSAL_1_5;  //?? should change to SPV_ENV_VULKAN_1_2, when available
+        return spv_target_env::SPV_ENV_VULKAN_1_2;
     default:
     default:
         break;
         break;
     }
     }

+ 1 - 1
known_good.json

@@ -5,7 +5,7 @@
       "site" : "github",
       "site" : "github",
       "subrepo" : "KhronosGroup/SPIRV-Tools",
       "subrepo" : "KhronosGroup/SPIRV-Tools",
       "subdir" : "External/spirv-tools",
       "subdir" : "External/spirv-tools",
-      "commit" : "5c019b5923c1f6bf00a3ac28114ec4a7b1faa0e2"
+      "commit" : "323a81fc5e30e43a04e5e22af4cba98ca2a161e6"
     },
     },
     {
     {
       "name" : "spirv-tools/external/spirv-headers",
       "name" : "spirv-tools/external/spirv-headers",