Sync from SUSE:SLFO:Main shaderc revision adef31bb5e9cb5350b38af8fe1367897

This commit is contained in:
Adrian Schröter 2024-05-04 00:37:58 +02:00
commit 80b3c22371
6 changed files with 395 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

View File

@ -0,0 +1,46 @@
---
CMakeLists.txt | 3 +--
libshaderc/CMakeLists.txt | 2 ++
utils/update_build_version.sh | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
Index: shaderc-2023.2/CMakeLists.txt
===================================================================
--- shaderc-2023.2.orig/CMakeLists.txt
+++ shaderc-2023.2/CMakeLists.txt
@@ -130,7 +130,6 @@ endif(MSVC)
# Configure subdirectories.
# We depend on these for later projects, so they should come first.
-add_subdirectory(third_party)
add_subdirectory(libshaderc_util)
add_subdirectory(libshaderc)
@@ -141,7 +140,7 @@ endif()
add_custom_target(build-version
${PYTHON_EXECUTABLE}
- ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
+ ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.sh
${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc
COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")
Index: shaderc-2023.2/libshaderc/CMakeLists.txt
===================================================================
--- shaderc-2023.2.orig/libshaderc/CMakeLists.txt
+++ shaderc-2023.2/libshaderc/CMakeLists.txt
@@ -67,6 +67,8 @@ set(SHADERC_LIBS
shaderc_util
SPIRV # from glslang
SPIRV-Tools
+ SPVRemapper
+ HLSL
)
target_link_libraries(shaderc PRIVATE ${SHADERC_LIBS})
Index: shaderc-2023.2/utils/update_build_version.sh
===================================================================
--- /dev/null
+++ shaderc-2023.2/utils/update_build_version.sh
@@ -0,0 +1 @@
+#!/bin/true

1
baselibs.conf Normal file
View File

@ -0,0 +1 @@
libshaderc_shared1

225
shaderc.changes Normal file
View File

@ -0,0 +1,225 @@
-------------------------------------------------------------------
Tue Mar 28 23:26:28 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- Update to release 2023.2
* Fix C++20 compatibility: explicitly construct string_piece when
comparing to `char *`
-------------------------------------------------------------------
Sun Dec 4 12:50:08 UTC 2022 - Dirk Müller <dmueller@suse.com>
- update to 2022.4:
* Add Cmake BUNDLE DESTINATION option for target install
-------------------------------------------------------------------
Fri Nov 25 10:20:34 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
- Drop pkgconfig files for not provided static libraries
-------------------------------------------------------------------
Mon Oct 24 20:29:48 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
- Update to release 2022.3
* Implement default builtin constants needed for GL_EXT_mesh_shader.
-------------------------------------------------------------------
Mon Aug 22 23:20:48 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
- Update to release 2022.2
* Add support for 16b-bit types in HLSL
-------------------------------------------------------------------
Mon Aug 8 12:07:29 UTC 2022 - Stephan Kulow <coolo@suse.com>
- Remove old python(2)-xml build dependency - build requires python3
-------------------------------------------------------------------
Mon Apr 18 23:38:20 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
- Update to release 2022.1
* Validator handles Nontemporal image operand
* Optimizer handles RayQueryKHR type
-------------------------------------------------------------------
Mon Mar 28 20:42:26 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Add baselibs.conf, containing libshaderc_shared1 (the shared lib).
-------------------------------------------------------------------
Sun Jan 30 14:58:58 UTC 2022 - Enrico Belleri <idesmi@protonmail.com>
- Update to release 2022.0
* Update to Glslang 11.8.0
* Support Vulkan 1.3
* Support targeting SPIR-V 1.6, which is the default for Vulkan 1.3
-------------------------------------------------------------------
Thu Nov 11 20:16:25 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
- Update to release 2021.3
* No user-visible changes
-------------------------------------------------------------------
Thu Jun 24 10:51:26 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
- Update to release 2021.1
* Add -fauto-combined-image-sampler option to glslc
* Disable deprecated --target-env=opengl_compat with an explicit
error message
-------------------------------------------------------------------
Wed May 5 09:28:57 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
- Upddate to release 2021.0
* No user-visible changes
-------------------------------------------------------------------
Mon Mar 1 08:44:37 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
- Update to release 2020.5
* Support newer glslang
-------------------------------------------------------------------
Mon Jan 11 00:50:07 UTC 2021 - Dirk Müller <dmueller@suse.com>
- update to 2020.4:
- Removed svpc
- Fixed issues with embedders getting duplicate symbols
- Converted C-style casts to static_cast
- Rolled ahead to fix/pickup Vulkan Raytracing support
-------------------------------------------------------------------
Fri Sep 4 12:08:28 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Update to release 2020.3:
* spvc: added support for Dawn using deprecated Options constructor
* spvc: added support for the additional fixed sample mask in MSL
-------------------------------------------------------------------
Mon Aug 17 01:07:43 UTC 2020 - malcolmlewis@opensuse.org
- Updated to release 2020.2:
* Support both posix and non-posix MinGW toolchains.
* Support optionally building Tint tooling for WGSL.
* Add -h option to glslc, spvc; same as --help.
* Update to Glslang generator 9.
* Add interface to support 16-bit types in HLSL
* Add glslc hidden experimental option -mfmt=wgsl; requires Tint.
* Add minimum buffer size for Dawn reflection.
- Changes from release 2020.1:
* Added warning signs about unsupported downloads.
* Removed Singleton pattern around access to glslang.
* Added concept of comparison sampler to API.
* Added support for options.hlsl.nonwritable_uav_texture_as_srv.
* Support forcing storage buffers to be always declared as UAV.
- Rebase 0001-Use-system-third-party-libs.patch.
-------------------------------------------------------------------
Wed Apr 8 11:59:02 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Update to release 2020.0
* Added support for new Glslang profile enum, EProfileCount.
* Add documentation for Vulkan 1.2 and SPIR-V 1.5.
* Added support for generating WebGPU SPIR-V to libshaderc.
-------------------------------------------------------------------
Mon Feb 17 12:45:35 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Update to release 2019.1
* Vulkan 1.2 support
* Add spvc parser support for a number of ops
- Drop 0001-Force-Glslang-to-support-HLSL-in-its-interface-784.patch
-------------------------------------------------------------------
Tue Nov 19 09:02:32 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Add 0001-Force-Glslang-to-support-HLSL-in-its-interface-784.patch
-------------------------------------------------------------------
Wed Jun 5 11:59:17 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Update to new upstream release 2019.0
* Add optional spvc, libshaderc_spvc as wrapper around
SPIRV-Cross.
* Support NV extensions for shader stages.
* spvc: Added option to specify source environment. Spvc will
transform from source to target environment if they are
different. This only works for WebGPU0 and Vulkan 1.1.
-------------------------------------------------------------------
Fri Dec 14 23:08:14 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
- Update to new upstream release 2018.0
* Support -fhlsl_functionality1 (also -fhlsl-functionality1)
* Support NVIDIA Turing extensions. Requires updated Glslang
and SPIRV-Tools.
* Use SPIR-V optimization and HLSL legalization recipes from
SPIRV-Tools.
* Pass target environment into SPIRV-Tools code, e.g. from
--target-env vulkan1.1 .
-------------------------------------------------------------------
Sat Mar 31 16:32:38 UTC 2018 - 9+suse@cirno.systems
- Update to version 20180329.g2a0f3a3:
* Use standard SPIRV-Tools transformation recipes
* Locate clang for Linux buildbots. (#446)
* Support setting target environment version, e.g. Vulkan 1.1
* Re-enable the Windows continuous Debug builds. (#444)
* Add build result badges to README. (#439)
* Glslang generator version 6
* Glslang generator version 5
* Update glslc README for -fauto-map-locations
* Add glslc tests for -fauto-map-locations
* Fix setting of debug DLL name for AppVeyor
* Adding kokoro build configurations. (#429)
* AppVeyor packaging: debug DLL name no longer has extra "d"
* Start v2018.0-dev
* Finalize v2017.2
* copyright check: Skip auto-generated CMakeFiles
* Update CHANGES for -fauto-map-locations
* Glslang now requires bindings on resources
* Add -fauto-map-locations option
-------------------------------------------------------------------
Fri Feb 23 02:20:35 UTC 2018 - 9+suse@cirno.systems
- Update to version 20180207.g563bc6e:
* Add a virtual destructor, otherwise Clang 6.0complains about delete being called on an abstract class.
* Skip Debug builds for VS 2013 and VS 2015
* Glslang updated its generator version number to 4
* Android.mk: add glslang/MachineIndependent/attribute.cpp
* Make tests resilient to better SPIR-V optimizations
* Travis CI: install pip and set clone depth to 1
* Adapt to Glslang codegen version update
-------------------------------------------------------------------
Thu Nov 23 21:57:06 UTC 2017 - 9@cirno.systems
- Update to version 20171030.g98ab88b:
* glslc tests: Relax version word check
* Avoid -fPIC for MinGW builds
* Allow override of SPVTOOLS_LOCAL_PATH
* Move spirv-tools build from third_party/Android.mk
* Update CHANGES
* Adapt to Glslang generator version number change
* Travis CI: use make to build
* Add HLSL legalization passes to compiler.cc
* Add SPIRV-Tools optimizer files for linker
* Added more opt passes to PassId enum
-------------------------------------------------------------------
Wed Nov 22 14:00:28 UTC 2017 - 9@cirno.systems
- Re-add explicit version dependencies
-------------------------------------------------------------------
Mon Nov 20 22:21:12 UTC 2017 - 9@cirno.systems
- Drop explicit version dependency on spirv-tools
-------------------------------------------------------------------
Fri Nov 3 13:01:32 UTC 2017 - 9@cirno.systems
- init

97
shaderc.spec Normal file
View File

@ -0,0 +1,97 @@
#
# spec file for package shaderc
#
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
# Remember to bump in baselibs.conf
%define lname libshaderc_shared1
Name: shaderc
Version: 2023.2
Release: 0
Summary: A collection of tools, libraries and tests for shader compilation
License: Apache-2.0
Group: Development/Tools/Other
URL: https://github.com/google/shaderc
#Git-Clone: https://github.com/google/shaderc
Source: https://github.com/google/shaderc/archive/v%version.tar.gz
Source99: baselibs.conf
Patch1: 0001-Use-system-third-party-libs.patch
BuildRequires: c++_compiler
BuildRequires: cmake >= 2.8.12
BuildRequires: glslang-devel >= 12
BuildRequires: glslang-nonstd-devel
BuildRequires: spirv-headers >= 1.6.1~sdk239
BuildRequires: spirv-tools-devel >= 2023.1
%description
A collection of tools, libraries and tests for shader compilation.
At the moment, included are:
* glslc, a command line compiler for GLSL/HLSL to SPIR-V, and
* libshaderc, a library API for doing the same.
Shaderc wraps around core functionality in glslang and SPIRV-Tools.
%package -n %lname
Summary: SPIR-V shader compiler library
Group: System/Libraries
%description -n %lname
A compiler library for GLSL/HLSL to SPIR-V.
Shaderc wraps around core functionality in glslang and SPIRV-Tools
%package devel
Summary: Header files for the shaderc library
Group: Development/Libraries/C and C++
Requires: %lname = %version
%description devel
A compiler library for GLSL/HLSL to SPIR-V.
Shaderc wraps around core functionality in glslang and SPIRV-Tools
%prep
%autosetup -p1
chmod a+x utils/update_build_version.sh
echo "\"%version\"" >glslc/src/build-version.inc
%build
%cmake -DSHADERC_SKIP_TESTS=ON
%cmake_build
%install
%cmake_install
# Remove static libraries and their pkgconfig files
rm %buildroot/%_libdir/*.a
rm %buildroot/%_libdir/pkgconfig/shaderc_{static,combined}.pc
%post -n %lname -p /sbin/ldconfig
%postun -n %lname -p /sbin/ldconfig
%files
%license LICENSE
%_bindir/glslc
%files -n %lname
%_libdir/libshaderc_shared.so.1*
%files devel
%_includedir/shaderc/
%_libdir/libshaderc_shared.so
%_libdir/pkgconfig/shaderc.pc
%changelog

BIN
v2023.2.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.