Hello community, here is the log from the commit of package shaderc for openSUSE:Factory checked in at 2019-11-19 12:59:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shaderc (Old) and /work/SRC/openSUSE:Factory/.shaderc.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shaderc" Tue Nov 19 12:59:47 2019 rev:3 rq:749468 version:2019.0 Changes: -------- --- /work/SRC/openSUSE:Factory/shaderc/shaderc.changes 2019-06-19 21:04:53.662319350 +0200 +++ /work/SRC/openSUSE:Factory/.shaderc.new.26869/shaderc.changes 2019-11-19 12:59:51.946113607 +0100 @@ -1,0 +2,5 @@ +Tue Nov 19 09:02:32 UTC 2019 - Jan Engelhardt <jeng...@inai.de> + +- Add 0001-Force-Glslang-to-support-HLSL-in-its-interface-784.patch + +------------------------------------------------------------------- New: ---- 0001-Force-Glslang-to-support-HLSL-in-its-interface-784.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shaderc.spec ++++++ --- /var/tmp/diff_new_pack.Ov9i2M/_old 2019-11-19 12:59:52.370113340 +0100 +++ /var/tmp/diff_new_pack.Ov9i2M/_new 2019-11-19 12:59:52.370113340 +0100 @@ -1,7 +1,7 @@ # # spec file for package shaderc # -# 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 @@ -23,9 +23,10 @@ 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 +URL: https://github.com/google/shaderc Source: %name-%version.tar.xz 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 ++++++ 0001-Force-Glslang-to-support-HLSL-in-its-interface-784.patch ++++++ >From ec4ea59c6d523ee563611651e6a15b1c31ffcd2e Mon Sep 17 00:00:00 2001 From: David Neto <dn...@google.com> 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; })";
