From 1c4c0f91aaca21cfad4fc2ca8784940f59a2c7eb82875e8ced98417ca54cc5ac Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 19 Nov 2019 08:41:45 +0000 Subject: [PATCH 1/3] - Enable HLSL optimizer. Add opt.diff. OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=63 --- glslang.changes | 5 +++++ glslang.spec | 6 ++++-- opt.diff | 19 +++++++++++++++++++ ver.diff | 10 +++++----- 4 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 opt.diff diff --git a/glslang.changes b/glslang.changes index b1acaa2..fd7c487 100644 --- a/glslang.changes +++ b/glslang.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 19 08:41:02 UTC 2019 - Jan Engelhardt + +- Enable HLSL optimizer. Add opt.diff. + ------------------------------------------------------------------- Thu Nov 7 08:25:53 UTC 2019 - Jan Engelhardt diff --git a/glslang.spec b/glslang.spec index 9264dcc..a6ea7ff 100644 --- a/glslang.spec +++ b/glslang.spec @@ -1,7 +1,7 @@ # # spec file for package glslang # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,12 +31,14 @@ URL: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ Source: %name-%version.tar.xz Patch1: ver.diff +Patch2: opt.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: cmake >= 2.8 BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: python3-base +BuildRequires: spirv-tools-devel %description glslang is a compiler front end for the OpenGL ES and OpenGL shading @@ -76,7 +78,7 @@ compressor's dictionary can find better cross module commonality. %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects # Trim -Wl,--no-undefined for now (https://github.com/KhronosGroup/glslang/issues/1484) -%cmake -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" +%cmake -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" -DENABLE_OPT=ON make %{?_smp_mflags} %install diff --git a/opt.diff b/opt.diff new file mode 100644 index 0000000..10ad636 --- /dev/null +++ b/opt.diff @@ -0,0 +1,19 @@ +--- + CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + +Index: glslang-7.13.3496/CMakeLists.txt +=================================================================== +--- glslang-7.13.3496.orig/CMakeLists.txt ++++ glslang-7.13.3496/CMakeLists.txt +@@ -163,10 +163,6 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA + add_subdirectory(External) + endif() + +-if(NOT TARGET SPIRV-Tools-opt) +- set(ENABLE_OPT OFF) +-endif() +- + if(ENABLE_OPT) + message(STATUS "optimizer enabled") + add_definitions(-DENABLE_OPT=1) diff --git a/ver.diff b/ver.diff index f38f057..f9187ea 100644 --- a/ver.diff +++ b/ver.diff @@ -26,7 +26,7 @@ Index: glslang-7.13.3496/SPIRV/CMakeLists.txt doc.h) add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) -+set_target_properties(SPIRV PROPERTIES SOVERSION suse8) ++set_target_properties(SPIRV PROPERTIES SOVERSION suse9) set_property(TARGET SPIRV PROPERTY FOLDER glslang) set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) target_include_directories(SPIRV PUBLIC @@ -34,7 +34,7 @@ Index: glslang-7.13.3496/SPIRV/CMakeLists.txt if (ENABLE_SPVREMAPPER) add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) -+ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse8) ++ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse9) set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON) endif() @@ -45,7 +45,7 @@ Index: glslang-7.13.3496/StandAlone/CMakeLists.txt @@ -1,5 +1,6 @@ add_library(glslang-default-resource-limits ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp) -+set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse8) ++set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse9) set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang) set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON) @@ -57,7 +57,7 @@ Index: glslang-7.13.3496/glslang/CMakeLists.txt glslang_pch(SOURCES MachineIndependent/pch.cpp) add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) -+set_target_properties(glslang PROPERTIES SOVERSION suse8) ++set_target_properties(glslang PROPERTIES SOVERSION suse9) set_property(TARGET glslang PROPERTY FOLDER glslang) set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON) target_link_libraries(glslang OGLCompiler OSDependent) @@ -69,7 +69,7 @@ Index: glslang-7.13.3496/hlsl/CMakeLists.txt glslang_pch(SOURCES pch.cpp) add_library(HLSL ${LIB_TYPE} ${SOURCES} ${HEADERS}) -+set_target_properties(HLSL PROPERTIES SOVERSION suse8) ++set_target_properties(HLSL PROPERTIES SOVERSION suse9) set_property(TARGET HLSL PROPERTY FOLDER hlsl) set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON) From 54304cf61d1d19ea8b71860c2a0a1335ec0c34a7c80b22218f3cb14d5d1a6b19 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 19 Nov 2019 09:02:58 +0000 Subject: [PATCH 2/3] osc copypac from project:X11:Wayland package:glslang revision:62 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=64 --- glslang.changes | 5 ----- glslang.spec | 6 ++---- opt.diff | 19 ------------------- ver.diff | 10 +++++----- 4 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 opt.diff diff --git a/glslang.changes b/glslang.changes index fd7c487..b1acaa2 100644 --- a/glslang.changes +++ b/glslang.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Nov 19 08:41:02 UTC 2019 - Jan Engelhardt - -- Enable HLSL optimizer. Add opt.diff. - ------------------------------------------------------------------- Thu Nov 7 08:25:53 UTC 2019 - Jan Engelhardt diff --git a/glslang.spec b/glslang.spec index a6ea7ff..9264dcc 100644 --- a/glslang.spec +++ b/glslang.spec @@ -1,7 +1,7 @@ # # spec file for package glslang # -# Copyright (c) 2019 SUSE LLC. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,14 +31,12 @@ URL: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ Source: %name-%version.tar.xz Patch1: ver.diff -Patch2: opt.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: cmake >= 2.8 BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: python3-base -BuildRequires: spirv-tools-devel %description glslang is a compiler front end for the OpenGL ES and OpenGL shading @@ -78,7 +76,7 @@ compressor's dictionary can find better cross module commonality. %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects # Trim -Wl,--no-undefined for now (https://github.com/KhronosGroup/glslang/issues/1484) -%cmake -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" -DENABLE_OPT=ON +%cmake -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" make %{?_smp_mflags} %install diff --git a/opt.diff b/opt.diff deleted file mode 100644 index 10ad636..0000000 --- a/opt.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- - CMakeLists.txt | 4 ---- - 1 file changed, 4 deletions(-) - -Index: glslang-7.13.3496/CMakeLists.txt -=================================================================== ---- glslang-7.13.3496.orig/CMakeLists.txt -+++ glslang-7.13.3496/CMakeLists.txt -@@ -163,10 +163,6 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA - add_subdirectory(External) - endif() - --if(NOT TARGET SPIRV-Tools-opt) -- set(ENABLE_OPT OFF) --endif() -- - if(ENABLE_OPT) - message(STATUS "optimizer enabled") - add_definitions(-DENABLE_OPT=1) diff --git a/ver.diff b/ver.diff index f9187ea..f38f057 100644 --- a/ver.diff +++ b/ver.diff @@ -26,7 +26,7 @@ Index: glslang-7.13.3496/SPIRV/CMakeLists.txt doc.h) add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) -+set_target_properties(SPIRV PROPERTIES SOVERSION suse9) ++set_target_properties(SPIRV PROPERTIES SOVERSION suse8) set_property(TARGET SPIRV PROPERTY FOLDER glslang) set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) target_include_directories(SPIRV PUBLIC @@ -34,7 +34,7 @@ Index: glslang-7.13.3496/SPIRV/CMakeLists.txt if (ENABLE_SPVREMAPPER) add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) -+ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse9) ++ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse8) set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON) endif() @@ -45,7 +45,7 @@ Index: glslang-7.13.3496/StandAlone/CMakeLists.txt @@ -1,5 +1,6 @@ add_library(glslang-default-resource-limits ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp) -+set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse9) ++set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse8) set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang) set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON) @@ -57,7 +57,7 @@ Index: glslang-7.13.3496/glslang/CMakeLists.txt glslang_pch(SOURCES MachineIndependent/pch.cpp) add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) -+set_target_properties(glslang PROPERTIES SOVERSION suse9) ++set_target_properties(glslang PROPERTIES SOVERSION suse8) set_property(TARGET glslang PROPERTY FOLDER glslang) set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON) target_link_libraries(glslang OGLCompiler OSDependent) @@ -69,7 +69,7 @@ Index: glslang-7.13.3496/hlsl/CMakeLists.txt glslang_pch(SOURCES pch.cpp) add_library(HLSL ${LIB_TYPE} ${SOURCES} ${HEADERS}) -+set_target_properties(HLSL PROPERTIES SOVERSION suse9) ++set_target_properties(HLSL PROPERTIES SOVERSION suse8) set_property(TARGET HLSL PROPERTY FOLDER hlsl) set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON) From b7375e6fb43dfe3262090ec3562bc90fb9bfb2ba825cb466d9c1f72e49521594 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 19 Jan 2020 11:59:37 +0000 Subject: [PATCH 3/3] - Update to snapshot 8.13.3559+git20 (b0ada803) OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=65 --- _service | 6 +++--- glslang-7.13.3496.tar.xz | 3 --- glslang-8.13.3559+git20.tar.xz | 3 +++ glslang.changes | 13 ++++++++++++ glslang.spec | 12 ++++++------ ver.diff | 36 +++++++++++++++++----------------- 6 files changed, 43 insertions(+), 30 deletions(-) delete mode 100644 glslang-7.13.3496.tar.xz create mode 100644 glslang-8.13.3559+git20.tar.xz diff --git a/_service b/_service index 33bed62..6bd793d 100644 --- a/_service +++ b/_service @@ -3,9 +3,9 @@ git https://github.com/KhronosGroup/glslang - 7.13.3496 - 7.13.3496 - 7.13.3496 + b0ada803 + 8.13.3559 + 8.13.3559+git@TAG_OFFSET@ *.tar diff --git a/glslang-7.13.3496.tar.xz b/glslang-7.13.3496.tar.xz deleted file mode 100644 index 4b766d7..0000000 --- a/glslang-7.13.3496.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d03420783e4a848444c61ccadca64d8aa9ae105cb9ac48cd243fca08d24ff46 -size 1670196 diff --git a/glslang-8.13.3559+git20.tar.xz b/glslang-8.13.3559+git20.tar.xz new file mode 100644 index 0000000..5f282f9 --- /dev/null +++ b/glslang-8.13.3559+git20.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24c6f34efcf91a7275f42198db3bfeca9f33297f0ff5f94e5f321fd6b8316aba +size 1676964 diff --git a/glslang.changes b/glslang.changes index b1acaa2..670cc4d 100644 --- a/glslang.changes +++ b/glslang.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun Jan 19 11:38:09 UTC 2020 - Jan Engelhardt + +- Update to snapshot 8.13.3559+git20 (b0ada803) + * SPIR-V: Aggressively prune unreachable merge, continue target. + * INTEL_shader_integer_functions2: Add basic extension + tracking, add compiler front-end support, add SPIR-V + generation. + * Add support for ARB_sample_shading, ARB_texture_multisample, + ARB_uniform_buffer_object, ARB_gpu_shader_fp64. + * SPV/Vulkan: Add support for Vulkan 1.2, which defaults to + SPIR-V 1.5. + ------------------------------------------------------------------- Thu Nov 7 08:25:53 UTC 2019 - Jan Engelhardt diff --git a/glslang.spec b/glslang.spec index 9264dcc..b3710a2 100644 --- a/glslang.spec +++ b/glslang.spec @@ -1,7 +1,7 @@ # # spec file for package glslang # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,11 +17,11 @@ # lname needs a bump for every change in commit (_service) -%define version_unconverted 7.13.3496 -%define lname libglslang-suse8 +%define version_unconverted 8.13.3559+git20 +%define lname libglslang-suse9 Name: glslang -Version: 7.13.3496 +Version: 8.13.3559+git20 Release: 0 Summary: OpenGL and OpenGL ES shader front end and validator License: BSD-3-Clause @@ -102,13 +102,13 @@ ln -s libglslang.so "$b/%_libdir/libOSDependent.so" %files -n %lname %defattr(-,root,root) -%_libdir/*.so.suse8* +%_libdir/*.so.suse9* %files devel %defattr(-,root,root) %_bindir/gls* %_bindir/spirv* -%_prefix/lib/cmake/ +%_libdir/cmake/ %_libdir/*resource*.so %_libdir/libHLSL.so %_libdir/libOGLCompiler.so diff --git a/ver.diff b/ver.diff index f38f057..5c535ce 100644 --- a/ver.diff +++ b/ver.diff @@ -18,58 +18,58 @@ There is no ABI stability to expect here. hlsl/CMakeLists.txt | 1 + 4 files changed, 5 insertions(+) -Index: glslang-7.13.3496/SPIRV/CMakeLists.txt +Index: glslang-8.13.3559+git20/SPIRV/CMakeLists.txt =================================================================== ---- glslang-7.13.3496.orig/SPIRV/CMakeLists.txt -+++ glslang-7.13.3496/SPIRV/CMakeLists.txt +--- glslang-8.13.3559+git20.orig/SPIRV/CMakeLists.txt ++++ glslang-8.13.3559+git20/SPIRV/CMakeLists.txt @@ -34,6 +34,7 @@ set(SPVREMAP_HEADERS doc.h) add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) -+set_target_properties(SPIRV PROPERTIES SOVERSION suse8) ++set_target_properties(SPIRV PROPERTIES SOVERSION suse9) set_property(TARGET SPIRV PROPERTY FOLDER glslang) set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) - target_include_directories(SPIRV PUBLIC + target_include_directories(SPIRV PUBLIC @@ -42,6 +43,7 @@ target_include_directories(SPIRV PUBLIC if (ENABLE_SPVREMAPPER) add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) -+ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse8) ++ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse9) set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON) endif() -Index: glslang-7.13.3496/StandAlone/CMakeLists.txt +Index: glslang-8.13.3559+git20/StandAlone/CMakeLists.txt =================================================================== ---- glslang-7.13.3496.orig/StandAlone/CMakeLists.txt -+++ glslang-7.13.3496/StandAlone/CMakeLists.txt +--- glslang-8.13.3559+git20.orig/StandAlone/CMakeLists.txt ++++ glslang-8.13.3559+git20/StandAlone/CMakeLists.txt @@ -1,5 +1,6 @@ add_library(glslang-default-resource-limits ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp) -+set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse8) ++set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse9) set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang) set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON) -Index: glslang-7.13.3496/glslang/CMakeLists.txt +Index: glslang-8.13.3559+git20/glslang/CMakeLists.txt =================================================================== ---- glslang-7.13.3496.orig/glslang/CMakeLists.txt -+++ glslang-7.13.3496/glslang/CMakeLists.txt +--- glslang-8.13.3559+git20.orig/glslang/CMakeLists.txt ++++ glslang-8.13.3559+git20/glslang/CMakeLists.txt @@ -79,6 +79,7 @@ set(HEADERS glslang_pch(SOURCES MachineIndependent/pch.cpp) add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) -+set_target_properties(glslang PROPERTIES SOVERSION suse8) ++set_target_properties(glslang PROPERTIES SOVERSION suse9) set_property(TARGET glslang PROPERTY FOLDER glslang) set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON) target_link_libraries(glslang OGLCompiler OSDependent) -Index: glslang-7.13.3496/hlsl/CMakeLists.txt +Index: glslang-8.13.3559+git20/hlsl/CMakeLists.txt =================================================================== ---- glslang-7.13.3496.orig/hlsl/CMakeLists.txt -+++ glslang-7.13.3496/hlsl/CMakeLists.txt +--- glslang-8.13.3559+git20.orig/hlsl/CMakeLists.txt ++++ glslang-8.13.3559+git20/hlsl/CMakeLists.txt @@ -20,6 +20,7 @@ set(HEADERS glslang_pch(SOURCES pch.cpp) add_library(HLSL ${LIB_TYPE} ${SOURCES} ${HEADERS}) -+set_target_properties(HLSL PROPERTIES SOVERSION suse8) ++set_target_properties(HLSL PROPERTIES SOVERSION suse9) set_property(TARGET HLSL PROPERTY FOLDER hlsl) set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON)