From 9002d16664b6d64d74dcd7a9cf2a220e68b516f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Tue, 28 May 2024 13:29:49 +0200 Subject: [PATCH] Update to 1.3.283.0 SDK --- 0001-pkg-config-compatibility.patch | 129 +++++++++++++++------------- gating.yaml | 6 ++ glslang.spec | 6 +- sources | 2 +- 4 files changed, 76 insertions(+), 67 deletions(-) create mode 100644 gating.yaml diff --git a/0001-pkg-config-compatibility.patch b/0001-pkg-config-compatibility.patch index c8a9742..888bf77 100644 --- a/0001-pkg-config-compatibility.patch +++ b/0001-pkg-config-compatibility.patch @@ -1,9 +1,9 @@ -diff -up glslang-sdk-1.3.268.0/CMakeLists.txt.dma glslang-sdk-1.3.268.0/CMakeLists.txt ---- glslang-sdk-1.3.268.0/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 -+++ glslang-sdk-1.3.268.0/CMakeLists.txt 2023-09-05 13:21:45.113297799 +1000 -@@ -92,6 +92,13 @@ else() - endif() - option(ENABLE_CTEST "Enables testing" ON) +diff -up glslang-sdk-1.3.275.0/CMakeLists.txt.dma glslang-sdk-1.3.275.0/CMakeLists.txt +--- glslang-sdk-1.3.275.0/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 ++++ glslang-sdk-1.3.275.0/CMakeLists.txt 2023-09-05 13:21:45.113297799 +1000 +@@ -106,6 +106,13 @@ endif() + + option(ENABLE_PCH "Enables Precompiled header" ON) +# using pkg-config to configure include paths and link libraries +include(FindPkgConfig) @@ -12,14 +12,14 @@ diff -up glslang-sdk-1.3.268.0/CMakeLists.txt.dma glslang-sdk-1.3.268.0/CMakeLis + pkg_check_modules(SPIRV_TOOLS_SHARED REQUIRED SPIRV-Tools-shared>=2019.2.1) +endif(BUILD_SHARED_LIBS) + - if(ENABLE_CTEST) - include(CTest) + if(ENABLE_HLSL) + add_compile_definitions(ENABLE_HLSL) endif() -@@ -263,27 +270,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External) +@@ -264,27 +271,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External) add_subdirectory(External) endif() --option(ALLOW_EXTERNAL_SPIRV_TOOLS "Allows to build against installed SPIRV-Tools-opt" OFF) +-option(ALLOW_EXTERNAL_SPIRV_TOOLS "Allows to build against installed SPIRV-Tools-opt. This is unsupported if the commit isn't the one in known_good.json") -if(NOT TARGET SPIRV-Tools-opt) - if(ALLOW_EXTERNAL_SPIRV_TOOLS) - # Look for external SPIR-V Tools build, if not building in-tree @@ -44,35 +44,47 @@ diff -up glslang-sdk-1.3.268.0/CMakeLists.txt.dma glslang-sdk-1.3.268.0/CMakeLis message(STATUS "optimizer enabled") add_definitions(-DENABLE_OPT=1) else() -diff -up glslang-sdk-1.3.268.0/External/CMakeLists.txt.dma glslang-sdk-1.3.268.0/External/CMakeLists.txt ---- glslang-sdk-1.3.268.0/External/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 -+++ glslang-sdk-1.3.268.0/External/CMakeLists.txt 2023-09-05 13:21:45.113297799 +1000 -@@ -68,10 +68,3 @@ if(BUILD_TESTING) +@@ -349,9 +336,6 @@ if (GLSLANG_ENABLE_INSTALL) + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake.in" [=[ + @PACKAGE_INIT@ + include(CMakeFindDependencyMacro) +- if(@ENABLE_OPT@) +- find_dependency(SPIRV-Tools-opt) +- endif() + @INSTALL_CONFIG_UNIX@ + include("@PACKAGE_PATH_EXPORT_TARGETS@") + ]=]) +diff -up glslang-sdk-1.3.275.0/External/CMakeLists.txt.dma glslang-sdk-1.3.275.0/External/CMakeLists.txt +--- glslang-sdk-1.3.275.0/External/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 ++++ glslang-sdk-1.3.275.0/External/CMakeLists.txt 2023-09-05 13:21:45.113297799 +1000 +@@ -68,10 +68,4 @@ if(GLSLANG_TESTS) endif() endif() -if(ENABLE_OPT AND NOT TARGET SPIRV-Tools-opt) - if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools) - set(SPIRV_SKIP_TESTS ON CACHE BOOL "Skip building SPIRV-Tools tests") -- add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools spirv-tools) +- add_subdirectory(spirv-tools) - endif() -endif() -- -diff -up glslang-sdk-1.3.268.0/glslang/CMakeLists.txt.dma glslang-sdk-1.3.268.0/glslang/CMakeLists.txt ---- glslang-sdk-1.3.268.0/glslang/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 -+++ glslang-sdk-1.3.268.0/glslang/CMakeLists.txt 2023-09-05 13:21:45.114297825 +1000 -@@ -244,6 +244,8 @@ if(ENABLE_GLSLANG_INSTALL) - add_library(GenericCodeGen ALIAS glslang::GenericCodeGen) - endif() - ") + + +diff -up glslang-sdk-1.3.275.0/glslang/CMakeLists.txt.dma glslang-sdk-1.3.275.0/glslang/CMakeLists.txt +--- glslang-sdk-1.3.275.0/glslang/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 ++++ glslang-sdk-1.3.275.0/glslang/CMakeLists.txt 2023-09-05 13:21:45.114297825 +1000 +@@ -232,6 +232,8 @@ if(GLSLANG_ENABLE_INSTALL) + if(NOT BUILD_SHARED_LIBS) + install(TARGETS MachineIndependent EXPORT glslang-targets) + install(TARGETS GenericCodeGen EXPORT glslang-targets) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) endif() -diff -up glslang-sdk-1.3.268.0/glslang/glslang.pc.cmake.in.dma glslang-sdk-1.3.268.0/glslang/glslang.pc.cmake.in ---- glslang-sdk-1.3.268.0/glslang/glslang.pc.cmake.in.dma 2023-09-05 13:21:45.115297852 +1000 -+++ glslang-sdk-1.3.268.0/glslang/glslang.pc.cmake.in 2023-09-05 13:21:45.115297852 +1000 + set(PUBLIC_HEADERS + +diff -up glslang-sdk-1.3.275.0/glslang/glslang.pc.cmake.in.dma glslang-sdk-1.3.275.0/glslang/glslang.pc.cmake.in +--- glslang-sdk-1.3.275.0/glslang/glslang.pc.cmake.in.dma 2023-09-05 13:21:45.115297852 +1000 ++++ glslang-sdk-1.3.275.0/glslang/glslang.pc.cmake.in 2023-09-05 13:21:45.115297852 +1000 @@ -0,0 +1,11 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ @@ -86,21 +98,21 @@ diff -up glslang-sdk-1.3.268.0/glslang/glslang.pc.cmake.in.dma glslang-sdk-1.3.2 + Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper + Cflags: -I${includedir} \ No newline at end of file -diff -up glslang-sdk-1.3.268.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.268.0/SPIRV/CMakeLists.txt ---- glslang-sdk-1.3.268.0/SPIRV/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 -+++ glslang-sdk-1.3.268.0/SPIRV/CMakeLists.txt 2023-09-05 13:21:45.116297879 +1000 -@@ -82,6 +82,10 @@ target_include_directories(SPIRV PUBLIC +diff -up glslang-sdk-1.3.275.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.275.0/SPIRV/CMakeLists.txt +--- glslang-sdk-1.3.275.0/SPIRV/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 ++++ glslang-sdk-1.3.275.0/SPIRV/CMakeLists.txt 2023-09-05 13:21:45.116297879 +1000 +@@ -89,6 +89,10 @@ target_include_directories(SPIRV PUBLIC glslang_add_build_info_dependency(SPIRV) + +set(SPIRV_NAME spirv) -+set(SPIRV_VERSION 1.3) ++set(SPIRV_VERSION 1.5.5) + if (ENABLE_SPVREMAPPER) add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) set_target_properties(SPVRemapper PROPERTIES -@@ -98,15 +102,21 @@ if(WIN32 AND BUILD_SHARED_LIBS) +@@ -105,10 +109,17 @@ if(WIN32 AND BUILD_SHARED_LIBS) endif() endif() @@ -112,34 +124,28 @@ diff -up glslang-sdk-1.3.268.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.268.0/SP + target_compile_options(SPIRV PUBLIC ${SPIRV_TOOLS_SHARED_CFLAGS_OTHER}) + target_link_libraries(SPIRV ${SPIRV_TOOLS_SHARED_LIBRARIES}) +endif(BUILD_SHARED_LIBS) -+ ++ if(ENABLE_OPT) - target_include_directories(SPIRV - PRIVATE ${spirv-tools_SOURCE_DIR}/include - PRIVATE ${spirv-tools_SOURCE_DIR}/source - ) -- target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt) +- target_link_libraries(SPIRV PRIVATE MachineIndependent PUBLIC SPIRV-Tools-opt) - target_include_directories(SPIRV PUBLIC -- $ -- $) +- $) + target_link_libraries(SPIRV glslang) else() target_link_libraries(SPIRV PRIVATE MachineIndependent) endif() -@@ -147,6 +157,9 @@ if(ENABLE_GLSLANG_INSTALL) - add_library(SPIRV ALIAS glslang::SPIRV) - ") - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/SPIRVTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) -- +@@ -125,5 +125,9 @@ if(GLSLANG_ENABLE_INSTALL) + + install(TARGETS SPIRV EXPORT glslang-targets) + + # spirv.pc Configuration + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/spirv.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -+ - install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/) ++ + install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/) endif() -diff -up glslang-sdk-1.3.268.0/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.268.0/SPIRV/spirv.pc.cmake.in ---- glslang-sdk-1.3.268.0/SPIRV/spirv.pc.cmake.in.dma 2023-09-05 13:21:45.116297879 +1000 -+++ glslang-sdk-1.3.268.0/SPIRV/spirv.pc.cmake.in 2023-09-05 13:21:45.116297879 +1000 +diff -up glslang-sdk-1.3.275.0/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.275.0/SPIRV/spirv.pc.cmake.in +--- glslang-sdk-1.3.275.0/SPIRV/spirv.pc.cmake.in.dma 2023-09-05 13:21:45.116297879 +1000 ++++ glslang-sdk-1.3.275.0/SPIRV/spirv.pc.cmake.in 2023-09-05 13:21:45.116297879 +1000 @@ -0,0 +1,11 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ @@ -153,9 +159,9 @@ diff -up glslang-sdk-1.3.268.0/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.268.0 + Libs: -L${libdir} -lSPIRV + Cflags: -I${includedir} \ No newline at end of file -diff -up glslang-sdk-1.3.268.0/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.268.0/SPIRV/SpvTools.cpp ---- glslang-sdk-1.3.268.0/SPIRV/SpvTools.cpp.dma 2023-08-09 04:49:36.000000000 +1000 -+++ glslang-sdk-1.3.268.0/SPIRV/SpvTools.cpp 2023-09-05 13:21:45.117297906 +1000 +diff -up glslang-sdk-1.3.275.0/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.275.0/SPIRV/SpvTools.cpp +--- glslang-sdk-1.3.275.0/SPIRV/SpvTools.cpp.dma 2023-08-09 04:49:36.000000000 +1000 ++++ glslang-sdk-1.3.275.0/SPIRV/SpvTools.cpp 2023-09-05 13:21:45.117297906 +1000 @@ -43,7 +43,7 @@ #include @@ -165,9 +171,9 @@ diff -up glslang-sdk-1.3.268.0/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.268.0/SPIR namespace glslang { -diff -up glslang-sdk-1.3.268.0/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.268.0/StandAlone/CMakeLists.txt ---- glslang-sdk-1.3.268.0/StandAlone/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 -+++ glslang-sdk-1.3.268.0/StandAlone/CMakeLists.txt 2023-09-05 13:22:23.806333232 +1000 +diff -up glslang-sdk-1.3.275.0/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.275.0/StandAlone/CMakeLists.txt +--- glslang-sdk-1.3.275.0/StandAlone/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 ++++ glslang-sdk-1.3.275.0/StandAlone/CMakeLists.txt 2023-09-05 13:22:23.806333232 +1000 @@ -63,6 +63,14 @@ set(LIBRARIES SPIRV glslang-default-resource-limits) @@ -183,13 +189,12 @@ diff -up glslang-sdk-1.3.268.0/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.268 if(WIN32) set(LIBRARIES ${LIBRARIES} psapi) elseif(UNIX) -@@ -72,9 +80,6 @@ elseif(UNIX) +@@ -72,8 +80,6 @@ elseif(UNIX) endif() target_link_libraries(glslang-standalone ${LIBRARIES}) -target_include_directories(glslang-standalone PUBLIC -- $ -- $) +- $) - if(ENABLE_OPT) - target_include_directories(glslang-standalone + if(ENABLE_SPVREMAPPER) + set(REMAPPER_SOURCES spirv-remap.cpp) diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..d353613 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,6 @@ +--- !Policy +product_versions: + - rhel-10 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional} diff --git a/glslang.spec b/glslang.spec index 4d4dbf0..74df012 100644 --- a/glslang.spec +++ b/glslang.spec @@ -1,7 +1,7 @@ -%global sdkver 1.3.268.0 +%global sdkver 1.3.283.0 Name: glslang -Version: 13.1.1 +Version: 14.2.0 Release: %autorelease Summary: OpenGL and OpenGL ES shader front end and validator @@ -61,8 +61,6 @@ popd %files devel %{_includedir}/glslang/ -%{_libdir}/libHLSL.a -%{_libdir}/libOGLCompiler.a %{_libdir}/libOSDependent.a %{_libdir}/libSPIRV.a %{_libdir}/libSPVRemapper.a diff --git a/sources b/sources index 27b44c7..bd8fa4a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glslang-sdk-1.3.268.0.tar.gz) = 5d03bd192505a58bf306e36438c8d68ee71cce8464adb8b36b06d30cc20202385bc4bc919274a73b3b7a3fbe2fb5aaf6c9ea30642398608bf1254ed23851c01f +SHA512 (glslang-sdk-1.3.283.0.tar.gz) = 297fb9c91d17c80d0f6a9812a2c785179ad58ebff2d12d5c57f7d4d2c37bab96a31656f430b97914c39d0c23e21f96718fd13437233a40d80bd4e001579facda