From 1d788d44f9668daa345ea5204298aadf82f9e686c81daced8e26835520f91d56 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 19 Nov 2019 09:11:22 +0000 Subject: [PATCH] rediff once OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/shaderc?expand=0&rev=7 --- ...to-support-HLSL-in-its-interface-784.patch | 65 +++++++++---------- 1 file changed, 31 insertions(+), 34 deletions(-) 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 index 4f0fae4..bf432e7 100644 --- a/0001-Force-Glslang-to-support-HLSL-in-its-interface-784.patch +++ b/0001-Force-Glslang-to-support-HLSL-in-its-interface-784.patch @@ -11,20 +11,20 @@ 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 + + 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(+) -diff --git a/README.md b/README.md -index e2c3355..172c8e0 100644 ---- a/README.md -+++ b/README.md -@@ -93,6 +93,14 @@ Shaderc into. - - The rest of this section describes how to build Shaderc from sources. +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 @@ -37,10 +37,10 @@ index e2c3355..172c8e0 100644 1) Check out the source code: ```sh -diff --git a/glslc/test/option_dash_fhlsl_offsets.py b/glslc/test/option_dash_fhlsl_offsets.py -index 631a275..4682d31 100644 ---- a/glslc/test/option_dash_fhlsl_offsets.py -+++ b/glslc/test/option_dash_fhlsl_offsets.py +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. @@ -49,11 +49,11 @@ index 631a275..4682d31 100644 buffer B { float x; vec3 y; } my_ssbo; void main() { my_ssbo.x = 1.0; -diff --git a/libshaderc/src/common_shaders_for_test.h b/libshaderc/src/common_shaders_for_test.h -index 512742a..c87ed76 100644 ---- a/libshaderc/src/common_shaders_for_test.h -+++ b/libshaderc/src/common_shaders_for_test.h -@@ -293,6 +293,7 @@ const char kShaderWithUniformsWithoutBindings[] = +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 @@ -61,11 +61,11 @@ index 512742a..c87ed76 100644 buffer B { float x; vec3 foo; } my_ssbo; void main() { my_ssbo.x = 1.0; })"; -diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt -index 85e100c..f8ae95d 100644 ---- a/libshaderc_util/CMakeLists.txt -+++ b/libshaderc_util/CMakeLists.txt -@@ -26,6 +26,9 @@ add_library(shaderc_util STATIC +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}) @@ -75,11 +75,11 @@ index 85e100c..f8ae95d 100644 find_package(Threads) target_link_libraries(shaderc_util PRIVATE -diff --git a/libshaderc_util/src/compiler_test.cc b/libshaderc_util/src/compiler_test.cc -index 1a0b21c..f6207e6 100644 ---- a/libshaderc_util/src/compiler_test.cc -+++ b/libshaderc_util/src/compiler_test.cc -@@ -119,6 +119,7 @@ const char kGlslVertShaderNoExplicitLocation[] = +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 @@ -87,6 +87,3 @@ index 1a0b21c..f6207e6 100644 buffer B { float x; vec3 foo; } my_ssbo; void main() { my_ssbo.x = 1.0; })"; --- -2.24.0 -