[spirv-tools,spirv-reflect,spirv-headers] update ports (#23822)

* update volk

* spriv

* Revert "update volk"

This reverts commit a478ebc8674c080d98b5eb61afdd1896c6a0d2c2.

* format

* versions

* versions

* update

* versions

* refix includes?

* version

* fix header include on linux,macos

* version

* fix cmake fixup

* fix

* version

* build shared

* version

* fix opt name

* version

* fix name...

* version

* change version to match sdk distribution version

* spirv-header version

* spirv reflect version
This commit is contained in:
Mathis Logemann 2022-04-07 16:52:15 +02:00 committed by GitHub
parent 1b3a783ff1
commit 611dfc1864
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 93 additions and 135 deletions

View File

@ -2,8 +2,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/SPIRV-Headers
REF bcf55210f13a4fa3c3d0963b509ff1070e434c79
SHA512 d0553b95f28b77209862059cd0a8c15ca3340f33e13d9bb75340ced07a5aa07b8b9eaa1bdc42daa0dbf78679c3b1ef3d344c73b17518061249cdc67000568c37
REF sdk-1.3.204.1
SHA512 ef994e0a5232cb21377ed39ef6a941b59eb45524f1d78092a6476245e4e0fb692780e98f5cc2176fdc2fd95430cce523fa376b0eed97042523b5f14a0586955f
HEAD_REF master
)

View File

@ -1,6 +1,6 @@
{
"name": "spirv-headers",
"version-date": "2021-03-25",
"version": "1.3.204.1",
"description": "Machine-readable files for the SPIR-V Registry",
"homepage": "https://github.com/KhronosGroup/SPIRV-Headers"
}

View File

@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/SPIRV-Reflect
REF d920b79aadafe3ffd52764ac80370b15a611c83a
SHA512 3e94adb9ec80f356bd51665f10e3e1d8e6236632d259a22fab97a156c6cf6fcbd1afc102ac4578fa3f3725b6cc0cbdf530c85fa133154d6c4e313324c1d6bbf4
REF sdk-1.3.204.1
SHA512 af0bfcb7a8565cbd981034900760d304792e9dfb0a166b712e3506475fdeff282e0ba0f02d82d671ee05e7ed0792815eba654b66af0739404bf38c9e12ebf4f5
HEAD_REF master
)

View File

@ -1,8 +1,9 @@
{
"name": "spirv-reflect",
"version-date": "2021-12-31",
"version": "1.3.204.1",
"description": "SPIRV-Reflect is a lightweight library that provides a C/C++ reflection API for SPIR-V shader bytecode in Vulkan applications.",
"homepage": "https://github.com/KhronosGroup/SPIRV-Reflect",
"license": "Apache-2.0",
"dependencies": [
{
"name": "vcpkg-cmake",

View File

@ -1,58 +0,0 @@
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 8247f6f..e28f6ee 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -420,7 +420,3 @@ if(ENABLE_SPIRV_TOOLS_INSTALL)
install(FILES ${CMAKE_BINARY_DIR}/${SPIRV_TOOLS}Config.cmake DESTINATION ${PACKAGE_DIR})
endif(ENABLE_SPIRV_TOOLS_INSTALL)
-if(MSVC AND (NOT ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")))
- # Enable parallel builds across four cores for this lib
- add_definitions(/MP4)
-endif()
diff --git a/source/fuzz/CMakeLists.txt b/source/fuzz/CMakeLists.txt
index 804fcf0..4915f07 100644
--- a/source/fuzz/CMakeLists.txt
+++ b/source/fuzz/CMakeLists.txt
@@ -419,10 +419,6 @@ if(SPIRV_BUILD_FUZZER)
${CMAKE_CURRENT_BINARY_DIR}/protobufs/spvtoolsfuzz.pb.cc
)
- if(MSVC AND (NOT ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")))
- # Enable parallel builds across four cores for this lib
- add_definitions(/MP4)
- endif()
spvtools_pch(SPIRV_TOOLS_FUZZ_SOURCES pch_source_fuzz)
diff --git a/source/opt/CMakeLists.txt b/source/opt/CMakeLists.txt
index 88d5658..e3faab7 100644
--- a/source/opt/CMakeLists.txt
+++ b/source/opt/CMakeLists.txt
@@ -218,11 +218,6 @@ set(SPIRV_TOOLS_OPT_SOURCES
wrap_opkill.cpp
)
-if(MSVC AND (NOT ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")))
- # Enable parallel builds across four cores for this lib
- add_definitions(/MP4)
-endif()
-
spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch_source_opt)
add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_TOOLS_OPT_SOURCES})
diff --git a/source/reduce/CMakeLists.txt b/source/reduce/CMakeLists.txt
index e589ad5..b93a37b 100644
--- a/source/reduce/CMakeLists.txt
+++ b/source/reduce/CMakeLists.txt
@@ -71,10 +71,6 @@ set(SPIRV_TOOLS_REDUCE_SOURCES
simple_conditional_branch_to_branch_reduction_opportunity.cpp
)
-if(MSVC AND (NOT ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")))
- # Enable parallel builds across four cores for this lib
- add_definitions(/MP4)
-endif()
spvtools_pch(SPIRV_TOOLS_REDUCE_SOURCES pch_source_reduce)

View File

@ -1,23 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ed56a8..66d1e66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -210,15 +210,9 @@ else()
endif()
if(ENABLE_SPIRV_TOOLS_INSTALL)
- if(WIN32)
- macro(spvtools_config_package_dir TARGET PATH)
- set(${PATH} ${TARGET}/cmake)
- endmacro()
- else()
- macro(spvtools_config_package_dir TARGET PATH)
- set(${PATH} ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET})
- endmacro()
- endif()
+ macro(spvtools_config_package_dir TARGET PATH)
+ set(${PATH} ${CMAKE_INSTALL_DATADIR}/${TARGET})
+ endmacro()
macro(spvtools_generate_config_file TARGET)
file(WRITE ${CMAKE_BINARY_DIR}/${TARGET}Config.cmake

View File

@ -1,17 +0,0 @@
diff --git a/source/reduce/CMakeLists.txt b/source/reduce/CMakeLists.txt
index 51e9b1d..90b1cb7 100644
--- a/source/reduce/CMakeLists.txt
+++ b/source/reduce/CMakeLists.txt
@@ -96,10 +96,10 @@ if(ENABLE_SPIRV_TOOLS_INSTALL)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- export(EXPORT SPIRV-Tools-reduceTargets FILE SPIRV-Tools-reduceTarget.cmake)
+ export(EXPORT SPIRV-Tools-reduceTargets FILE SPIRV-Tools-reduceTargets.cmake)
spvtools_config_package_dir(SPIRV-Tools-reduce PACKAGE_DIR)
- install(EXPORT SPIRV-Tools-reduceTargets FILE SPIRV-Tools-reduceTarget.cmake
+ install(EXPORT SPIRV-Tools-reduceTargets FILE SPIRV-Tools-reduceTargets.cmake
DESTINATION ${PACKAGE_DIR})
spvtools_generate_config_file(SPIRV-Tools-reduce)

View File

@ -1,15 +1,8 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/SPIRV-Tools
REF v2021.1
SHA512 e8478eacb86415f75a1e5b3f66a0508b01a9f7e9d8b070eb0329ca56be137f5543dd42125a1033cb8552c01f46e11affd7fda866231b3742c66de9b4341930d5
PATCHES
cmake-install.patch
install-config-typo.patch
0001-don-t-use-MP4.patch
REF v2022.1
SHA512 19ff4386c74c15f9b870d5348b76c7d643da5bf1637b1faed153d9ec9f00de941a83a22782f169b4aa5001c715721937c3bb3bc07541a60e503a0455a1d2287e
)
vcpkg_find_acquire_program(PYTHON3)
@ -25,33 +18,71 @@ else()
set(SKIP_EXECUTABLES OFF)
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DSPIRV-Headers_SOURCE_DIR=${CURRENT_INSTALLED_DIR}
-DSPIRV_WERROR=OFF
-DSPIRV_SKIP_EXECUTABLES=${SKIP_EXECUTABLES} # option SPIRV_SKIP_TESTS follows this value
-DSPIRV_SKIP_TESTS=ON
-DSPIRV_SKIP_EXECUTABLES=${SKIP_EXECUTABLES}
-DENABLE_SPIRV_TOOLS_INSTALL=${TOOLS_INSTALL}
-DSPIRV_TOOLS_BUILD_STATIC=ON
-DENABLE_SPIRV_TOOLS_INSTALL=ON
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/SPIRV-Tools TARGET_PATH share/SPIRV-Tools) # the directory name is capitalized as opposed to the package name
vcpkg_fixup_cmake_targets(CONFIG_PATH share/SPIRV-Tools-link TARGET_PATH share/SPIRV-Tools-link)
vcpkg_fixup_cmake_targets(CONFIG_PATH share/SPIRV-Tools-opt TARGET_PATH share/SPIRV-Tools-opt)
vcpkg_fixup_cmake_targets(CONFIG_PATH share/SPIRV-Tools-reduce TARGET_PATH share/SPIRV-Tools-reduce)
vcpkg_cmake_install()
# the directory name is capitalized as opposed to the port name
if(WIN32)
vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools/cmake PACKAGE_NAME SPIRV-Tools)
vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-link/cmake PACKAGE_NAME SPIRV-Tools-link)
vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-lint/cmake PACKAGE_NAME SPIRV-Tools-lint)
vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-opt/cmake PACKAGE_NAME SPIRV-Tools-opt)
vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-reduce/cmake PACKAGE_NAME SPIRV-Tools-reduce)
else()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools PACKAGE_NAME SPIRV-Tools DO_NOT_DELETE_PARENT_CONFIG_PATH)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-link PACKAGE_NAME SPIRV-Tools-link DO_NOT_DELETE_PARENT_CONFIG_PATH)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-lint PACKAGE_NAME SPIRV-Tools-lint DO_NOT_DELETE_PARENT_CONFIG_PATH)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-opt PACKAGE_NAME SPIRV-Tools-opt DO_NOT_DELETE_PARENT_CONFIG_PATH)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-reduce PACKAGE_NAME SPIRV-Tools-reduce) # now delete
endif()
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") # only static linkage, i.e. no need to preserve .dll/.so files
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/SPIRV-Tools-shared.dll")
file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libSPIRV-Tools-shared.so")
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libSPIRV-Tools-shared.so")
if(TOOLS_INSTALL)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
vcpkg_copy_tools(
TOOL_NAMES
spirv-as
spirv-cfg
spirv-dis
spirv-link
spirv-lint
spirv-opt
spirv-reduce
spirv-val
AUTO_CLEAN
)
endif()
if(WIN32)
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools"
"${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-link"
"${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-lint"
"${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-opt"
"${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-reduce"
"${CURRENT_PACKAGES_DIR}/SPIRV-Tools"
"${CURRENT_PACKAGES_DIR}/SPIRV-Tools-link"
"${CURRENT_PACKAGES_DIR}/SPIRV-Tools-lint"
"${CURRENT_PACKAGES_DIR}/SPIRV-Tools-opt"
"${CURRENT_PACKAGES_DIR}/SPIRV-Tools-reduce"
)
endif()
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share"
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
# lesspipe.sh is the only file there
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

View File

@ -1,9 +1,18 @@
{
"name": "spirv-tools",
"version-string": "2021.1",
"version": "2022.1",
"description": "API and commands for processing SPIR-V modules",
"homepage": "https://github.com/KhronosGroup/SPIRV-Tools",
"license": "Apache-2.0",
"dependencies": [
"spirv-headers"
"spirv-headers",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

View File

@ -6665,15 +6665,15 @@
"port-version": 2
},
"spirv-headers": {
"baseline": "2021-03-25",
"baseline": "1.3.204.1",
"port-version": 0
},
"spirv-reflect": {
"baseline": "2021-12-31",
"baseline": "1.3.204.1",
"port-version": 0
},
"spirv-tools": {
"baseline": "2021.1",
"baseline": "2022.1",
"port-version": 0
},
"spix": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2b51afa759a0312e325533a909418ed5b7803cda",
"version": "1.3.204.1",
"port-version": 0
},
{
"git-tree": "28d7c25f7908e3ac693c769c3ce6474855a05bcb",
"version-date": "2021-03-25",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ca2155d2cbf6c3493ac3129f333308976975cb50",
"version": "1.3.204.1",
"port-version": 0
},
{
"git-tree": "bcebcfdd9e9332b68c4185b3127fc898fc91402a",
"version-date": "2021-12-31",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "459985359177e0c0774ac341db9721650499844b",
"version": "2022.1",
"port-version": 0
},
{
"git-tree": "c18f04e12fa671a9067896ccdf8c932601f81115",
"version-string": "2021.1",