diff options
Diffstat (limited to 'meta/recipes-graphics/shaderc/files/0002-shaderc-2019.0-fix-build-against-new-glslang.patch')
-rw-r--r-- | meta/recipes-graphics/shaderc/files/0002-shaderc-2019.0-fix-build-against-new-glslang.patch | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/meta/recipes-graphics/shaderc/files/0002-shaderc-2019.0-fix-build-against-new-glslang.patch b/meta/recipes-graphics/shaderc/files/0002-shaderc-2019.0-fix-build-against-new-glslang.patch deleted file mode 100644 index b31b88de48..0000000000 --- a/meta/recipes-graphics/shaderc/files/0002-shaderc-2019.0-fix-build-against-new-glslang.patch +++ /dev/null | |||
@@ -1,73 +0,0 @@ | |||
1 | From 44e99802fa16bb5b53b5e80c2c84f305802d494d Mon Sep 17 00:00:00 2001 | ||
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | ||
3 | Date: Tue, 13 Oct 2020 15:20:11 +0100 | ||
4 | Subject: [PATCH 2/3] shaderc-2019.0: fix build against new glslang | ||
5 | |||
6 | posted to the arch package repository by: svenstaro@gmail.com | ||
7 | https://github.com/archlinux/svntogit-packages/commit/72283b634a0bd7c8d99cc605e273fe1294b77b44 | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | ||
12 | --- | ||
13 | libshaderc/src/shaderc.cc | 2 +- | ||
14 | libshaderc_util/src/compiler.cc | 10 +--------- | ||
15 | 2 files changed, 2 insertions(+), 10 deletions(-) | ||
16 | |||
17 | diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc | ||
18 | index 3c3c3de..b5fc6cb 100644 | ||
19 | --- a/libshaderc/src/shaderc.cc | ||
20 | +++ b/libshaderc/src/shaderc.cc | ||
21 | @@ -20,7 +20,7 @@ | ||
22 | #include <sstream> | ||
23 | #include <vector> | ||
24 | |||
25 | -#include "SPIRV/spirv.hpp" | ||
26 | +#include "glslang/SPIRV/spirv.hpp" | ||
27 | |||
28 | #include "libshaderc_util/compiler.h" | ||
29 | #include "libshaderc_util/counting_includer.h" | ||
30 | diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc | ||
31 | index ef7867f..acc172b 100644 | ||
32 | --- a/libshaderc_util/src/compiler.cc | ||
33 | +++ b/libshaderc_util/src/compiler.cc | ||
34 | @@ -26,7 +26,7 @@ | ||
35 | #include "libshaderc_util/string_piece.h" | ||
36 | #include "libshaderc_util/version_profile.h" | ||
37 | |||
38 | -#include "SPIRV/GlslangToSpv.h" | ||
39 | +#include "glslang/SPIRV/GlslangToSpv.h" | ||
40 | |||
41 | namespace { | ||
42 | using shaderc_util::string_piece; | ||
43 | @@ -291,17 +291,12 @@ std::tuple<bool, std::vector<uint32_t>, size_t> Compiler::Compile( | ||
44 | bases[static_cast<int>(UniformKind::StorageBuffer)]); | ||
45 | shader.setShiftUavBinding( | ||
46 | bases[static_cast<int>(UniformKind::UnorderedAccessView)]); | ||
47 | - shader.setHlslIoMapping(hlsl_iomap_); | ||
48 | shader.setResourceSetBinding( | ||
49 | hlsl_explicit_bindings_[static_cast<int>(used_shader_stage)]); | ||
50 | shader.setEnvClient(target_client_info.client, | ||
51 | target_client_info.client_version); | ||
52 | shader.setEnvTarget(target_client_info.target_language, | ||
53 | target_client_info.target_language_version); | ||
54 | - if (hlsl_functionality1_enabled_) { | ||
55 | - shader.setEnvTargetHlslFunctionality1(); | ||
56 | - } | ||
57 | - | ||
58 | const EShMessages rules = GetMessageRules(target_env_, source_language_, | ||
59 | hlsl_offsets_, | ||
60 | generate_debug_info_); | ||
61 | @@ -478,9 +473,6 @@ std::tuple<bool, std::string, std::string> Compiler::PreprocessShader( | ||
62 | } | ||
63 | shader.setEnvClient(target_client_info.client, | ||
64 | target_client_info.client_version); | ||
65 | - if (hlsl_functionality1_enabled_) { | ||
66 | - shader.setEnvTargetHlslFunctionality1(); | ||
67 | - } | ||
68 | |||
69 | // The preprocessor might be sensitive to the target environment. | ||
70 | // So combine the existing rules with the just-give-me-preprocessor-output | ||
71 | -- | ||
72 | 2.28.0 | ||
73 | |||