diff --git a/baselibs.conf b/baselibs.conf index e8bc44a..e52d048 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libSPIRV-Tools-suse25 +libSPIRV-Tools-suse26 spirv-tools-devel requires -spirv-tools- - requires "libSPIRV-Tools-suse25- = " + requires "libSPIRV-Tools-suse26- = " diff --git a/sdk-1.3.216.0.tar.gz b/sdk-1.3.216.0.tar.gz new file mode 100644 index 0000000..101540b --- /dev/null +++ b/sdk-1.3.216.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b82c5d4790ea4c27ff3a6152fc2fbbb11f6d89702f04d6c644512d851608d67b +size 3019645 diff --git a/spirv-tools.changes b/spirv-tools.changes index 38a81ca..cf637a2 100644 --- a/spirv-tools.changes +++ b/spirv-tools.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Jun 15 16:51:34 UTC 2022 - Jan Engelhardt + +- Update to 2022.3~sdk216 (SDK-1.3.216.0) + * Add folding rule to generate Fma instructions + * Add support for SPV_KHR_subgroup_rotate + * spirv-val: Add CullMaskKHR support + * Add SPV_KHR_fragment_shader_barycentric support + * Add more folding for composite instructions + * spirv-val: Add PerVertexKHR + * Fold multiply and subtraction into FMA with negation + ------------------------------------------------------------------- Mon Apr 18 23:33:42 UTC 2022 - Jan Engelhardt diff --git a/spirv-tools.spec b/spirv-tools.spec index 910329d..d064aa8 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -17,17 +17,18 @@ %define _lto_cflags %nil -%define lname libSPIRV-Tools-suse25 +%define lname libSPIRV-Tools-suse26 Name: spirv-tools -Version: 2022.2 +Version: 2022.3~sdk216 Release: 0 Summary: API and commands for processing SPIR-V modules License: Apache-2.0 Group: Development/Libraries/C and C++ URL: https://github.com/KhronosGroup/SPIRV-Tools -Source: https://github.com/KhronosGroup/SPIRV-Tools/archive/v%version.tar.gz +#Source: https://github.com/KhronosGroup/SPIRV-Tools/archive/v%version.tar.gz +Source: https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/sdk-1.3.216.0.tar.gz Source9: baselibs.conf Patch1: ver.diff Patch2: gcc48.diff @@ -37,7 +38,7 @@ BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: python3-base BuildRequires: python3-xml -BuildRequires: spirv-headers >= 1.6.1+sdk211 +BuildRequires: spirv-headers >= 1.6.1+sdk216 %description The package includes an assembler, binary module parser, @@ -65,7 +66,7 @@ validator, and is used in the standalone tools whilst also enabling integration into other code bases directly. %prep -%autosetup -p1 -n SPIRV-Tools-%version +%autosetup -p1 -n SPIRV-Tools-sdk-1.3.216.0 %build %if 0%{?suse_version} >= 1550 diff --git a/v2022.2.tar.gz b/v2022.2.tar.gz deleted file mode 100644 index f76e220..0000000 --- a/v2022.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:909fc7e68049dca611ca2d57828883a86f503b0353ff78bc594eddc65eb882b9 -size 2994426 diff --git a/ver.diff b/ver.diff index 8c40d51..6c3c713 100644 --- a/ver.diff +++ b/ver.diff @@ -21,7 +21,7 @@ Index: SPIRV-Tools-2022.2/source/CMakeLists.txt add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES}) spirv_tools_default_target_options(${SPIRV_TOOLS}-shared) set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES CXX_VISIBILITY_PRESET hidden) -+set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse25) ++set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse26) target_compile_definitions(${SPIRV_TOOLS}-shared PRIVATE SPIRV_TOOLS_IMPLEMENTATION PUBLIC SPIRV_TOOLS_SHAREDLIB @@ -29,7 +29,7 @@ Index: SPIRV-Tools-2022.2/source/CMakeLists.txt spirv_tools_default_target_options(${SPIRV_TOOLS}-static) # The static target does not have the '-static' suffix. set_target_properties(${SPIRV_TOOLS}-static PROPERTIES OUTPUT_NAME "${SPIRV_TOOLS}") -+ set_target_properties(${SPIRV_TOOLS}-static PROPERTIES SOVERSION suse25) ++ set_target_properties(${SPIRV_TOOLS}-static PROPERTIES SOVERSION suse26) # Create the "${SPIRV_TOOLS}" target as an alias to either "${SPIRV_TOOLS}-static" # or "${SPIRV_TOOLS}-shared" depending on the value of BUILD_SHARED_LIBS. @@ -37,7 +37,7 @@ Index: SPIRV-Tools-2022.2/source/CMakeLists.txt set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static ${SPIRV_TOOLS}-shared) else() add_library(${SPIRV_TOOLS} ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_SOURCES}) -+ set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse25) ++ set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse26) spirv_tools_default_target_options(${SPIRV_TOOLS}) set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS} ${SPIRV_TOOLS}-shared) endif() @@ -51,7 +51,7 @@ Index: SPIRV-Tools-2022.2/source/diff/CMakeLists.txt + set_property(TARGET SPIRV-Tools-diff PROPERTY FOLDER "SPIRV-Tools libraries") -+set_target_properties(SPIRV-Tools-diff PROPERTIES SOVERSION suse25) ++set_target_properties(SPIRV-Tools-diff PROPERTIES SOVERSION suse26) spvtools_check_symbol_exports(SPIRV-Tools-diff) if(ENABLE_SPIRV_TOOLS_INSTALL) @@ -63,7 +63,7 @@ Index: SPIRV-Tools-2022.2/source/fuzz/CMakeLists.txt spvtools_pch(SPIRV_TOOLS_FUZZ_SOURCES pch_source_fuzz) add_library(SPIRV-Tools-fuzz ${SPIRV_TOOLS_FUZZ_SOURCES}) -+ set_target_properties(SPIRV-Tools-fuzz PROPERTIES SOVERSION suse25) ++ set_target_properties(SPIRV-Tools-fuzz PROPERTIES SOVERSION suse26) spvtools_default_compile_options(SPIRV-Tools-fuzz) @@ -75,7 +75,7 @@ Index: SPIRV-Tools-2022.2/source/link/CMakeLists.txt add_library(SPIRV-Tools-link ${SPIRV_TOOLS_LIBRARY_TYPE} linker.cpp ) -+set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse25) ++set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse26) spvtools_default_compile_options(SPIRV-Tools-link) target_include_directories(SPIRV-Tools-link @@ -87,7 +87,7 @@ Index: SPIRV-Tools-2022.2/source/lint/CMakeLists.txt add_library(SPIRV-Tools-lint ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_TOOLS_LINT_SOURCES}) -+set_target_properties(SPIRV-Tools-lint PROPERTIES SOVERSION suse25) ++set_target_properties(SPIRV-Tools-lint PROPERTIES SOVERSION suse26) spvtools_default_compile_options(SPIRV-Tools-lint) target_include_directories(SPIRV-Tools-lint PUBLIC @@ -99,7 +99,7 @@ Index: SPIRV-Tools-2022.2/source/opt/CMakeLists.txt add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_TOOLS_OPT_SOURCES}) -+set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse25) ++set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse26) spvtools_default_compile_options(SPIRV-Tools-opt) target_include_directories(SPIRV-Tools-opt PUBLIC @@ -111,7 +111,7 @@ Index: SPIRV-Tools-2022.2/source/reduce/CMakeLists.txt $ PRIVATE ${spirv-tools_BINARY_DIR} ) -+set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse25) ++set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse26) # The reducer reuses a lot of functionality from the SPIRV-Tools library. target_link_libraries(SPIRV-Tools-reduce PUBLIC ${SPIRV_TOOLS_FULL_VISIBILITY}