update to vulkan 1.3.168 (#2909)

pull/2939/head
Arthur Laurent 1 year ago committed by GitHub
parent e13d098dd4
commit 4a682f12fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      packages/g/glslang/xmake.lua
  2. 1
      packages/s/spirv-cross/xmake.lua
  3. 10
      packages/s/spirv-headers/xmake.lua
  4. 1
      packages/s/spirv-reflect/xmake.lua
  5. 1
      packages/s/spirv-tools/xmake.lua
  6. 11
      packages/v/volk/xmake.lua
  7. 11
      packages/v/vulkan-headers/xmake.lua
  8. 2
      packages/v/vulkan-hpp/xmake.lua
  9. 10
      packages/v/vulkan-loader/xmake.lua

@ -14,6 +14,7 @@ package("glslang")
add_versions("1.3.246+1", "14e5a04e70057972eef8a40df422e30a3b70e4b5")
add_versions("1.3.250+1", "d1517d64cfca91f573af1bf7341dc3a5113349c0")
add_versions("1.3.261+1", "76b52ebf77833908dc4c0dd6c70a9c357ac720bd")
add_versions("1.3.268+0", "36d08c0d940cf307a23928299ef52c7970d8cee6")
add_patches("1.3.246+1", "https://github.com/KhronosGroup/glslang/commit/1e4955adbcd9b3f5eaf2129e918ca057baed6520.patch", "47893def550f1684304ef7c49da38f0a8fe35c190a3452d3bf58370b3ee7165d")
@ -71,6 +72,7 @@ package("glslang")
end
table.insert(configs, "-DENABLE_EXCEPTIONS=" .. (package:config("exceptions") and "ON" or "OFF"))
table.insert(configs, "-DENABLE_RTTI=" .. (package:config("rtti") and "ON" or "OFF"))
table.insert(configs, "-DALLOW_EXTERNAL_SPIRV_TOOLS=ON")
import("package.tools.cmake").install(package, configs, {packagedeps = {"spirv-tools"}})
if not package:config("binaryonly") then
package:add("links", "glslang", "MachineIndependent", "GenericCodeGen", "OGLCompiler", "OSDependent", "HLSL", "SPIRV", "SPVRemapper")

@ -9,6 +9,7 @@ package("spirv-cross")
add_versions("1.2.162+0", "6d10da0224bd3214c9a507832e62d9fb6ae9620d")
add_versions("1.2.189+1", "0e2880ab990e79ce6cc8c79c219feda42d98b1e8")
add_versions("1.3.231+1", "f09ba2777714871bddb70d049878af34b94fa54d")
add_versions("1.3.268+0", "2de1265fca722929785d9acdec4ab728c47a0254")
add_deps("cmake")
add_links("spirv-cross-c", "spirv-cross-cpp", "spirv-cross-reflect", "spirv-cross-msl", "spirv-cross-util", "spirv-cross-hlsl", "spirv-cross-glsl", "spirv-cross-core")

@ -4,7 +4,14 @@ package("spirv-headers")
set_description("SPIR-V Headers")
set_license("MIT")
add_urls("https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/$(version).tar.gz", {version = function (version) return version:startswith("v") and version or "sdk-" .. version:gsub("%+", ".") end})
add_urls("https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/$(version).tar.gz", {version = function (version)
local prefix = "sdk-"
if version:gt("1.3.261+1") then
prefix = "vulkan-sdk-"
end
return version:startswith("v") and version or prefix .. version:gsub("%+", ".")
end})
add_versions("1.2.198+0", "3301a23aca0434336a643e433dcacacdd60000ab3dd35dc0078a297c06124a12")
add_versions("1.3.211+0", "30a78e61bd812c75e09fdc7a319af206b1044536326bc3e85fea818376a12568")
add_versions("1.3.231+1", "fc340700b005e9a2adc98475b5afbbabd1bc931f789a2afd02d54ebc22522af3")
@ -13,6 +20,7 @@ package("spirv-headers")
add_versions("1.3.246+1", "71668e18ef7b318b06f8c466f46abad965b2646eaa322594cd015c2ac87133e6")
add_versions("1.3.250+1", "d5f8c4b7906baf9c51aedbbb2dd942009e8658e3340c6e64699518666a03e043")
add_versions("1.3.261+1", "32b4c6ae6a2fa9b56c2c17233c8056da47e331f76e117729925825ea3e77a739")
add_versions("1.3.268+0", "1022379e5b920ae21ccfb5cb41e07b1c59352a18c3d3fdcbf38d6ae7733384d4")
add_patches("1.3.261+1", "https://github.com/KhronosGroup/SPIRV-Headers/commit/c43effd54686240d8b13762279d5392058d10e27.patch", "b97a05c35c00620519a5f3638a974fc2a01f062bf6e86b74b49a234f82cc55ce")

@ -10,6 +10,7 @@ package("spirv-reflect")
add_versions("1.3.231+1", "b68b5a8a5d8ab5fce79e6596f3a731291046393a")
add_versions("1.3.250+1", "1fd43331f0bd77cc0f421745781f79a14d8f2bb1")
add_versions("1.3.261+1", "d7e316e7d592d16ac58f1fe39b1df7babfe65c0d")
add_versions("1.3.268+0", "3f468129720eded0cef4077302e491036d099856")
add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})

@ -14,6 +14,7 @@ package("spirv-tools")
add_versions("1.3.246+1", "sdk-1.3.246.1")
add_versions("1.3.250+1", "sdk-1.3.250.1")
add_versions("1.3.261+1", "sdk-1.3.261.1")
add_versions("1.3.268+0", "vulkan-sdk-1.3.268.0")
add_deps("cmake >=3.17.2")
add_deps("python 3.x", {kind = "binary"})

@ -4,7 +4,13 @@ package("volk")
set_license("MIT")
add_urls("https://github.com/zeux/volk/archive/$(version).tar.gz", {version = function (version)
return version:ge("1.3.226") and format("sdk-%s", version:gsub("%+", ".")) or version
local prefix = ""
if version:gt("1.3.261+1") then
prefix = "vulkan-sdk-"
elseif version:ge("1.3.226") then
prefix = "sdk-"
end
return prefix .. version:gsub("%+", ".")
end})
add_urls("https://github.com/zeux/volk.git")
add_versions("1.2.190", "07f03720b8c70a626c98cc9545350538122bca9f853e6ed20ccad5a25d55fa4b")
@ -13,6 +19,7 @@ package("volk")
add_versions("1.3.231+1", "fac8d3d295e88bcc6bfb2b729d2c4babb2ea04ccb39fd918a3471b2d756789b9")
add_versions("1.3.250+1", "673241c6561fb4965f873d7fcdece17d950b24c77d6cf41466e47bdc2af67b81")
add_versions("1.3.261+1", "052866c6cbff9efdf1e73e71c1d65070c36863730c95a4e93833500b4d894d69")
add_versions("1.3.268+0", "f1d30fac1cdc17a8fdc8c69f371663547f92db99cfd612962190bb1e2c8ce74d")
add_deps("vulkan-headers")
@ -67,4 +74,4 @@ package("volk")
volkInitialize();
}
]]}, {configs = {defines = defines}}))
end)
end)

@ -3,11 +3,18 @@ package("vulkan-headers")
set_homepage("https://github.com/KhronosGroup/Vulkan-Headers/")
set_description("Vulkan Header files and API registry")
set_license("Apache-2.0")
add_urls("https://github.com/KhronosGroup/Vulkan-Headers.git")
add_urls("https://github.com/KhronosGroup/Vulkan-Headers/archive/$(version).tar.gz", {version = function (version) return version:startswith("v") and version or "sdk-" .. version:gsub("%+", ".") end})
add_urls("https://github.com/KhronosGroup/Vulkan-Headers/archive/$(version).tar.gz", {version = function (version)
local prefix = "sdk-"
if version:gt("1.3.261+1") then
prefix = "vulkan-sdk-"
end
return version:startswith("v") and version or prefix .. version:gsub("%+", ".")
end})
-- when adding a new sdk version, please also update vulkan-loader, spirv-headers, spirv-reflect, glslang and volk packages
add_versions("1.3.268+0", "94993cbe2b1a604c0d5d9ea37a767e1aba4d771d2bfd4ddceefd66243095164f")
add_versions("1.3.261+1", "7a25ebdb6325e626dc5d33bc937b289ccce7ddb7b0ac1a1b1d5d7ff33b6715d3")
add_versions("1.3.250+1", "e5b563a415e73725bcf471b7e3e837804ed3703b47cce4553db5e7e73821c5ee")
add_versions("1.3.246+1", "f9fa6a05ac1e059cd6f8f3a21705fb5bc093743d97315b7acf3bc20921abc27c")

@ -15,6 +15,8 @@ package("vulkan-hpp")
add_versions("v1.3.244", "1bd3877dcc7f3fbf5a43e4d2f0fcc4ebadf6af85")
add_versions("v1.3.254", "9f89f760a661ff5d7e1e5cc93de13eb4026307b5")
add_versions("v1.3.261", "3d27c1736a8d520f4d577d9d41566ce1b1fc346e")
add_versions("v1.3.268", "d2134fefe22279595aee73752099022222468a60")
add_versions("v1.3.272", "e621db07719c0c1c738ad39ef400737a750bb23a")
add_deps("cmake")

@ -3,7 +3,15 @@ package("vulkan-loader")
set_description("This project provides the Khronos official Vulkan ICD desktop loader for Windows, Linux, and MacOS.")
set_license("Apache-2.0")
add_urls("https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-$(version).tar.gz", {version = function (version) return version:gsub("%+", ".") end})
add_urls("https://github.com/KhronosGroup/Vulkan-Loader/archive/$(version).tar.gz", {version = function (version)
local prefix = "sdk-"
if version:gt("1.3.261+1") then
prefix = "vulkan-sdk-"
end
return prefix .. version:gsub("%+", ".")
end})
add_versions("1.3.268+0", "404fa621f1ab2731bcc68bcbff64d8c6de322faad2d87f9198641bd37255fd39")
add_versions("1.3.261+1", "f85f0ea57b63750d4ddaf6c8649df781c4777006daa3cd772b01e7b5ed02f3f2")
add_versions("1.3.250+1", "b982ec5fae9af6364816a7c5fcf4d3e5c29bfdca35f4b12ee1f90e492e41adc2")
add_versions("1.3.246+1", "5ffb79b83ec539233ee793dd3c50aa241bd9bd67103d45d3f4b657f1620b7553")

Loading…
Cancel
Save