From a3069e1df4945c8baf0da89a796edc863d0dcb4c Mon Sep 17 00:00:00 2001 From: Juan Ramos Date: Tue, 28 Nov 2023 12:00:59 -0700 Subject: [PATCH] cmake: Remove SPIRV-Tools workaround As of KhronosGroup/SPIRV-Tools/pull/5482 SPIRV-Tools builds cleanly for Android/iOS by default --- CMakeLists.txt | 1 - known_good.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 45b875a3..6d71b64f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,7 +69,6 @@ endif() # Furthermore testing is equally problematic. if (IOS OR ANDROID) set(ENABLE_GLSLANG_BINARIES OFF) - set(SPIRV_SKIP_EXECUTABLES ON) set(ENABLE_CTEST OFF) set(BUILD_TESTING OFF) diff --git a/known_good.json b/known_good.json index 876381cf..e78cfb01 100644 --- a/known_good.json +++ b/known_good.json @@ -5,7 +5,7 @@ "site" : "github", "subrepo" : "KhronosGroup/SPIRV-Tools", "subdir" : "External/spirv-tools", - "commit" : "360d469b9eac54d6c6e20f609f9ec35e3a5380ad" + "commit": "afaf8fda2ad0364655909b56c8b634ce89095bb5" }, { "name" : "spirv-tools/external/spirv-headers",