From 5f103e90469af967828054638ac603082cdab6193b603d0b2a8e02fec8a64258 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 17 Feb 2020 12:59:38 +0000 Subject: [PATCH] - Update to release 2019.1 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/shaderc?expand=0&rev=9 --- ...to-support-HLSL-in-its-interface-784.patch | 89 ------------------- 0001-Use-system-third-party-libs.patch | 31 +++---- _service | 14 --- shaderc-2019.0.tar.xz | 3 - shaderc.changes | 8 ++ shaderc.spec | 9 +- v2019.1.tar.gz | 3 + 7 files changed, 32 insertions(+), 125 deletions(-) delete mode 100644 0001-Force-Glslang-to-support-HLSL-in-its-interface-784.patch delete mode 100644 _service delete mode 100644 shaderc-2019.0.tar.xz create mode 100644 v2019.1.tar.gz diff --git a/0001-Force-Glslang-to-support-HLSL-in-its-interface-784.patch b/0001-Force-Glslang-to-support-HLSL-in-its-interface-784.patch deleted file mode 100644 index bf432e7..0000000 --- a/0001-Force-Glslang-to-support-HLSL-in-its-interface-784.patch +++ /dev/null @@ -1,89 +0,0 @@ -From ec4ea59c6d523ee563611651e6a15b1c31ffcd2e Mon Sep 17 00:00:00 2001 -From: David Neto -Date: Wed, 21 Aug 2019 21:33:34 -0400 -Subject: [PATCH] Force Glslang to support HLSL in its interface (#784) - -Fixes a compilation problem introduced by recent -Glslang changes to optionally build into a very small -GLSL-only binary. - -Also fix test cases to have set and binding layout qualifiers on -buffers when compiling for Vulkan. This rule is now enforced by -Glslang. ---- - README.md | 8 ++++++++ - glslc/test/option_dash_fhlsl_offsets.py | 1 + - libshaderc/src/common_shaders_for_test.h | 1 + - libshaderc_util/CMakeLists.txt | 3 +++ - libshaderc_util/src/compiler_test.cc | 1 + - 5 files changed, 14 insertions(+) - -Index: shaderc-2019.0/README.md -=================================================================== ---- shaderc-2019.0.orig/README.md -+++ shaderc-2019.0/README.md -@@ -73,6 +73,14 @@ Shaderc into. - artifacts built by [Appveyor][appveyor] for the top of the tree of the master - branch under the "Artifacts" tab of a certain job. - -+Note: Shaderc assumes Glslang supports HLSL compilation. The instructions -+below assume you're building Glslang from sources, and in a subtree -+of `shaderc/third_party`. In that scenario, Glslang's HLSL support -+is automatically enabled. Shaderc also can be built using a Glslang -+from outside the `shaderc/third_party` tree. In that case you must -+ensure that that external Glslang is built with HLSL functionality. -+See Glslang's `ENABLE_HLSL` CMake setting.) -+ - 1) Check out the source code: - - ```sh -Index: shaderc-2019.0/glslc/test/option_dash_fhlsl_offsets.py -=================================================================== ---- shaderc-2019.0.orig/glslc/test/option_dash_fhlsl_offsets.py -+++ shaderc-2019.0/glslc/test/option_dash_fhlsl_offsets.py -@@ -19,6 +19,7 @@ from placeholder import FileShader - - # A GLSL shader with uniforms without explicit bindings. - GLSL_SHADER = """#version 450 -+ layout(set=0, binding=0) - buffer B { float x; vec3 y; } my_ssbo; - void main() { - my_ssbo.x = 1.0; -Index: shaderc-2019.0/libshaderc/src/common_shaders_for_test.h -=================================================================== ---- shaderc-2019.0.orig/libshaderc/src/common_shaders_for_test.h -+++ shaderc-2019.0/libshaderc/src/common_shaders_for_test.h -@@ -293,6 +293,7 @@ const char kShaderWithUniformsWithoutBin - // A GLSL vertex shader with a weirdly packed block. - const char kGlslShaderWeirdPacking[] = - R"(#version 450 -+ layout(set=0, binding=0) - buffer B { float x; vec3 foo; } my_ssbo; - void main() { my_ssbo.x = 1.0; })"; - -Index: shaderc-2019.0/libshaderc_util/CMakeLists.txt -=================================================================== ---- shaderc-2019.0.orig/libshaderc_util/CMakeLists.txt -+++ shaderc-2019.0/libshaderc_util/CMakeLists.txt -@@ -25,6 +25,9 @@ add_library(shaderc_util STATIC - shaderc_default_compile_options(shaderc_util) - target_include_directories(shaderc_util - PUBLIC include PRIVATE ${glslang_SOURCE_DIR}) -+# We use parts of Glslang's HLSL compilation interface, which -+# now requires this preprocessor definition. -+add_definitions(-DENABLE_HLSL) - - find_package(Threads) - target_link_libraries(shaderc_util PRIVATE -Index: shaderc-2019.0/libshaderc_util/src/compiler_test.cc -=================================================================== ---- shaderc-2019.0.orig/libshaderc_util/src/compiler_test.cc -+++ shaderc-2019.0/libshaderc_util/src/compiler_test.cc -@@ -118,6 +118,7 @@ const char kGlslVertShaderNoExplicitLoca - // A GLSL vertex shader with a weirdly packed block. - const char kGlslShaderWeirdPacking[] = - R"(#version 450 -+ layout(set = 0, binding = 0) - buffer B { float x; vec3 foo; } my_ssbo; - void main() { my_ssbo.x = 1.0; })"; - diff --git a/0001-Use-system-third-party-libs.patch b/0001-Use-system-third-party-libs.patch index 8f0cf02..0d01e0a 100644 --- a/0001-Use-system-third-party-libs.patch +++ b/0001-Use-system-third-party-libs.patch @@ -3,16 +3,16 @@ Date: Fri, 3 Nov 2017 11:58:14 +0100 Subject: [PATCH 1/2] Use system third party libs --- - CMakeLists.txt | 6 ------ + CMakeLists.txt | 7 ------- glslc/CMakeLists.txt | 2 +- libshaderc/CMakeLists.txt | 2 ++ - 3 files changed, 3 insertions(+), 7 deletions(-) + 3 files changed, 3 insertions(+), 8 deletions(-) -Index: shaderc-2019.0/CMakeLists.txt +Index: shaderc-2019.1/CMakeLists.txt =================================================================== ---- shaderc-2019.0.orig/CMakeLists.txt -+++ shaderc-2019.0/CMakeLists.txt -@@ -70,7 +70,6 @@ endif(MSVC) +--- shaderc-2019.1.orig/CMakeLists.txt ++++ shaderc-2019.1/CMakeLists.txt +@@ -92,7 +92,6 @@ endif(MSVC) # Configure subdirectories. # We depend on these for later projects, so they should come first. @@ -20,22 +20,23 @@ Index: shaderc-2019.0/CMakeLists.txt if(SHADERC_ENABLE_SPVC) add_subdirectory(libshaderc_spvc) -@@ -81,11 +80,6 @@ add_subdirectory(libshaderc) +@@ -103,12 +102,6 @@ add_subdirectory(libshaderc) add_subdirectory(glslc) add_subdirectory(examples) -add_custom_target(build-version - ${PYTHON_EXECUTABLE} - ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py -- ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} +- ${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).") - +- function(define_pkg_config_file NAME LIBS) add_custom_target(${NAME}-pkg-config ALL -Index: shaderc-2019.0/glslc/CMakeLists.txt + COMMAND ${CMAKE_COMMAND} +Index: shaderc-2019.1/glslc/CMakeLists.txt =================================================================== ---- shaderc-2019.0.orig/glslc/CMakeLists.txt -+++ shaderc-2019.0/glslc/CMakeLists.txt +--- shaderc-2019.1.orig/glslc/CMakeLists.txt ++++ shaderc-2019.1/glslc/CMakeLists.txt @@ -18,7 +18,7 @@ add_library(glslc STATIC shaderc_default_compile_options(glslc) target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR}) @@ -45,10 +46,10 @@ Index: shaderc-2019.0/glslc/CMakeLists.txt target_link_libraries(glslc PRIVATE shaderc_util shaderc) add_executable(glslc_exe src/main.cc) -Index: shaderc-2019.0/libshaderc/CMakeLists.txt +Index: shaderc-2019.1/libshaderc/CMakeLists.txt =================================================================== ---- shaderc-2019.0.orig/libshaderc/CMakeLists.txt -+++ shaderc-2019.0/libshaderc/CMakeLists.txt +--- shaderc-2019.1.orig/libshaderc/CMakeLists.txt ++++ shaderc-2019.1/libshaderc/CMakeLists.txt @@ -46,6 +46,8 @@ set(SHADERC_LIBS shaderc_util SPIRV # from glslang diff --git a/_service b/_service deleted file mode 100644 index c26ab94..0000000 --- a/_service +++ /dev/null @@ -1,14 +0,0 @@ - - - git - git://github.com/google/shaderc - v2019.0 - v2019.0 - 2019.0 - - - *.tar - xz - - - diff --git a/shaderc-2019.0.tar.xz b/shaderc-2019.0.tar.xz deleted file mode 100644 index fb3b792..0000000 --- a/shaderc-2019.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7271e00d3ebb7e4b8de56203950556294fa74bb7e25b96e046541de34840d21 -size 169476 diff --git a/shaderc.changes b/shaderc.changes index 984cbfe..f9a6776 100644 --- a/shaderc.changes +++ b/shaderc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Feb 17 12:45:35 UTC 2020 - Jan Engelhardt + +- 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 diff --git a/shaderc.spec b/shaderc.spec index 1d746ef..3eacbaa 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,7 +1,7 @@ # # spec file for package shaderc # -# Copyright (c) 2019 SUSE LLC. +# 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 @@ -18,15 +18,16 @@ Name: shaderc %define lname libshaderc_shared1 -Version: 2019.0 +Version: 2019.1 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 -Source: %name-%version.tar.xz + +#Git-Clone: https://github.com/google/shaderc +Source: https://github.com/google/shaderc/archive/v%version.tar.gz Patch1: 0001-Use-system-third-party-libs.patch -Patch2: 0001-Force-Glslang-to-support-HLSL-in-its-interface-784.patch BuildRequires: c++_compiler BuildRequires: cmake BuildRequires: glslang-devel >= 7 diff --git a/v2019.1.tar.gz b/v2019.1.tar.gz new file mode 100644 index 0000000..cb7a44c --- /dev/null +++ b/v2019.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:290264af7c8265c55c57e5184c8162cdec3747762f18ba9a9f8f7f9e13e2246d +size 268907