update spirv-reflect, glslang (#1585)

* update spirv-reflect, glslang

* update spirv-tools

* fix spirv-tools

* fix spirv-reflect

* see log

* fix spirv-tools

* use is_cross

packages/g/glslang/xmake.lua

@@ -5,14 +5,15 @@ package("glslang")
     set_license("Apache-2.0")
 
     add_urls("https://github.com/KhronosGroup/glslang.git")
-    add_versions("1.3.211+0", "9bb8cfffb0eed010e07132282c41d73064a7a609")
     add_versions("1.2.154+1", "bacaef3237c515e40d1a24722be48c0a0b30f75f")
     add_versions("1.2.162+0", "c594de23cdd790d64ad5f9c8b059baae0ee2941d")
     add_versions("1.2.189+1", "2fb89a0072ae7316af1c856f22663fde4928128a")
+    add_versions("1.3.211+0", "9bb8cfffb0eed010e07132282c41d73064a7a609")
+    add_versions("1.3.231+1", "5755de46b07e4374c05fb1081f65f7ae1f8cca81")
 
-    add_configs("binaryonly", { description = "Only use binary program.", default = false, type = "boolean"})
-    add_configs("exceptions", { description = "Build with exception support.", default = false, type = "boolean"})
-    add_configs("rtti", { description = "Build with RTTI support.", default = false, type = "boolean"})
+    add_configs("binaryonly", {description = "Only use binary program.", default = false, type = "boolean"})
+    add_configs("exceptions", {description = "Build with exception support.", default = false, type = "boolean"})
+    add_configs("rtti",       {description = "Build with RTTI support.", default = false, type = "boolean"})
 
     add_deps("cmake", "python 3.x", {kind = "binary"})
     add_deps("spirv-tools")
@@ -57,7 +58,7 @@ package("glslang")
     end)
 
     on_test(function (package)
-        if not package:is_plat("mingw") or is_subhost("msys") then
+        if not package:is_cross() then
             os.vrun("glslangValidator --version")
         end
         if not package:config("binaryonly") then

packages/s/spirv-headers/xmake.lua

@@ -8,6 +8,7 @@ package("spirv-headers")
     add_urls("https://github.com/KhronosGroup/SPIRV-Headers/archive/$(version).tar.gz", {version = function (version) return version:startswith("v") and version or "sdk-" .. version:gsub("%+", ".") end})
     add_versions("1.2.198+0", "3301a23aca0434336a643e433dcacacdd60000ab3dd35dc0078a297c06124a12")
     add_versions("1.3.211+0", "30a78e61bd812c75e09fdc7a319af206b1044536326bc3e85fea818376a12568")
+    add_versions("1.3.231+0", "dbd579f6d1351d03f49b821fb273a068ab6ca9e4e0beb498d48eb4d5f72d8dee")
 
     add_deps("cmake")
     on_install(function (package)

packages/s/spirv-reflect/xmake.lua

@@ -8,6 +8,9 @@ package("spirv-reflect")
     add_versions("1.2.154+1", "5de48fe8d3ef434e846d64ed758adc5d26335ae5")
     add_versions("1.2.162+0", "481e34d666031eae28423f3b723a1a8c717d7636")
     add_versions("1.2.189+1", "272e050728de8d4a4ce9e7101c1244e6ff56e5b0")
+    add_versions("1.3.231+0", "b68b5a8a5d8ab5fce79e6596f3a731291046393a")
+
+    add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
 
     add_deps("spirv-headers")
 
@@ -16,11 +19,17 @@ package("spirv-reflect")
         io.writefile("xmake.lua", [[
             add_rules("mode.debug", "mode.release")
             add_requires("spirv-headers")
-            target("spirv-reflect")
+            target("spirv-reflect-static")
                 set_kind("static")
-                add_packages("spirv-headers")
+                add_packages("spirv-headers", {public = true})
                 add_files("spirv_reflect.c")
                 add_headerfiles("spirv_reflect.h")
+            target("spirv-reflect")
+                set_kind("binary")
+                set_languages("c++11")
+                add_deps("spirv-reflect-static")
+                add_includedirs(".")
+                add_files("main.cpp", "examples/arg_parser.cpp", "examples/common.cpp", "common/output_stream.cpp")
         ]])
         import("package.tools.xmake").install(package)
     end)

packages/s/spirv-tools/xmake.lua

@@ -10,11 +10,12 @@ package("spirv-tools")
     add_versions("2021.3", "b6b4194121ee8084c62b20f8d574c32f766e4e9237dfe60b0658b316d19c6b13")
     add_versions("2021.4", "d68de260708dda785d109ff1ceeecde2d2ab71142fa5bf59061bb9f47dd3bb2c")
     add_versions("2022.2", "909fc7e68049dca611ca2d57828883a86f503b0353ff78bc594eddc65eb882b9")
+    add_versions("2022.4", "a156215a2d7c6c5b267933ed691877a9a66f07d75970da33ce9ad627a71389d7")
 
     add_patches("2020.5", "https://github.com/KhronosGroup/SPIRV-Tools/commit/a1d38174b1f7d2651c718ae661886d606cb50a32.patch", "2811faeef3ad53a83e409c8ef9879badcf9dc04fc3d98dbead7313514b819933")
 
-    add_deps("cmake", "python 3.x", {kind = "binary"})
-    add_deps("spirv-headers")
+    add_deps("cmake", "spirv-headers")
+    add_deps("python 3.x", {kind = "binary"})
     if is_plat("linux") then
         add_extsources("apt::spirv-tools", "pacman::spirv-tools")
     end
@@ -41,7 +42,7 @@ package("spirv-tools")
 
     on_install("linux", "windows", "macosx", "mingw", function (package)
         package:addenv("PATH", "bin")
-        local configs = {"-DSPIRV_SKIP_TESTS=ON"}
+        local configs = {"-DSPIRV_SKIP_TESTS=ON", "-DSPIRV_WERROR=OFF"}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         local spirv = package:dep("spirv-headers")
@@ -60,7 +61,7 @@ package("spirv-tools")
     end)
 
     on_test(function (package)
-        if not package:is_plat("mingw") or is_subhost("msys") then
+        if not package:is_cross() then
             os.runv("spirv-as --help")
             os.runv("spirv-opt --help")
         end