rpm/shaderc
SHA256
1
0
Fork 0
forked from pool/shaderc
Code Pull Requests Activity

rediff once

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/shaderc?expand=0&rev=7
This commit is contained in:
Jan Engelhardt 2019-11-19 09:11:22 +00:00 committed by Git OBS Bridge
parent 02d4351238
commit 1d788d44f9
1 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
0001-Force-Glslang-to-support-HLSL-in-its-interface-784.patch
View File

@ -18,13 +18,13 @@ Glslang.
libshaderc_util/src/compiler_test.cc | 1 + libshaderc_util/src/compiler_test.cc | 1 +
5 files changed, 14 insertions(+) 5 files changed, 14 insertions(+)
diff --git a/README.md b/README.md Index: shaderc-2019.0/README.md
index e2c3355..172c8e0 100644 ===================================================================
--- a/README.md --- shaderc-2019.0.orig/README.md
+++ b/README.md +++ shaderc-2019.0/README.md
@@ -93,6 +93,14 @@ Shaderc into. @@ -73,6 +73,14 @@ Shaderc into.
artifacts built by [Appveyor][appveyor] for the top of the tree of the master
The rest of this section describes how to build Shaderc from sources. branch under the "Artifacts" tab of a certain job.
+Note: Shaderc assumes Glslang supports HLSL compilation. The instructions +Note: Shaderc assumes Glslang supports HLSL compilation. The instructions
+below assume you're building Glslang from sources, and in a subtree +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: 1) Check out the source code:
```sh ```sh
diff --git 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
index 631a275..4682d31 100644 ===================================================================
--- a/glslc/test/option_dash_fhlsl_offsets.py --- shaderc-2019.0.orig/glslc/test/option_dash_fhlsl_offsets.py
+++ b/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 @@ -19,6 +19,7 @@ from placeholder import FileShader
# A GLSL shader with uniforms without explicit bindings. # A GLSL shader with uniforms without explicit bindings.
@ -49,11 +49,11 @@ index 631a275..4682d31 100644
buffer B { float x; vec3 y; } my_ssbo; buffer B { float x; vec3 y; } my_ssbo;
void main() { void main() {
my_ssbo.x = 1.0; my_ssbo.x = 1.0;
diff --git a/libshaderc/src/common_shaders_for_test.h b/libshaderc/src/common_shaders_for_test.h Index: shaderc-2019.0/libshaderc/src/common_shaders_for_test.h
index 512742a..c87ed76 100644 ===================================================================
--- a/libshaderc/src/common_shaders_for_test.h --- shaderc-2019.0.orig/libshaderc/src/common_shaders_for_test.h
+++ b/libshaderc/src/common_shaders_for_test.h +++ shaderc-2019.0/libshaderc/src/common_shaders_for_test.h
@@ -293,6 +293,7 @@ const char kShaderWithUniformsWithoutBindings[] = @@ -293,6 +293,7 @@ const char kShaderWithUniformsWithoutBin
// A GLSL vertex shader with a weirdly packed block. // A GLSL vertex shader with a weirdly packed block.
const char kGlslShaderWeirdPacking[] = const char kGlslShaderWeirdPacking[] =
R"(#version 450 R"(#version 450
@ -61,11 +61,11 @@ index 512742a..c87ed76 100644
buffer B { float x; vec3 foo; } my_ssbo; buffer B { float x; vec3 foo; } my_ssbo;
void main() { my_ssbo.x = 1.0; })"; void main() { my_ssbo.x = 1.0; })";
diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt Index: shaderc-2019.0/libshaderc_util/CMakeLists.txt
index 85e100c..f8ae95d 100644 ===================================================================
--- a/libshaderc_util/CMakeLists.txt --- shaderc-2019.0.orig/libshaderc_util/CMakeLists.txt
+++ b/libshaderc_util/CMakeLists.txt +++ shaderc-2019.0/libshaderc_util/CMakeLists.txt
@@ -26,6 +26,9 @@ add_library(shaderc_util STATIC @@ -25,6 +25,9 @@ add_library(shaderc_util STATIC
shaderc_default_compile_options(shaderc_util) shaderc_default_compile_options(shaderc_util)
target_include_directories(shaderc_util target_include_directories(shaderc_util
PUBLIC include PRIVATE ${glslang_SOURCE_DIR}) PUBLIC include PRIVATE ${glslang_SOURCE_DIR})
@ -75,11 +75,11 @@ index 85e100c..f8ae95d 100644
find_package(Threads) find_package(Threads)
target_link_libraries(shaderc_util PRIVATE target_link_libraries(shaderc_util PRIVATE
diff --git a/libshaderc_util/src/compiler_test.cc b/libshaderc_util/src/compiler_test.cc Index: shaderc-2019.0/libshaderc_util/src/compiler_test.cc
index 1a0b21c..f6207e6 100644 ===================================================================
--- a/libshaderc_util/src/compiler_test.cc --- shaderc-2019.0.orig/libshaderc_util/src/compiler_test.cc
+++ b/libshaderc_util/src/compiler_test.cc +++ shaderc-2019.0/libshaderc_util/src/compiler_test.cc
@@ -119,6 +119,7 @@ const char kGlslVertShaderNoExplicitLocation[] = @@ -118,6 +118,7 @@ const char kGlslVertShaderNoExplicitLoca
// A GLSL vertex shader with a weirdly packed block. // A GLSL vertex shader with a weirdly packed block.
const char kGlslShaderWeirdPacking[] = const char kGlslShaderWeirdPacking[] =
R"(#version 450 R"(#version 450
@ -87,6 +87,3 @@ index 1a0b21c..f6207e6 100644
buffer B { float x; vec3 foo; } my_ssbo; buffer B { float x; vec3 foo; } my_ssbo;
void main() { my_ssbo.x = 1.0; })"; void main() { my_ssbo.x = 1.0; })";
--
2.24.0