1 diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc
2 index 3c3c3de..b5fc6cb 100644
3 --- a/libshaderc/src/shaderc.cc
4 +++ b/libshaderc/src/shaderc.cc
5 @@ -20,7 +20,7 @@
6 #include <sstream>
7 #include <vector>
8
9 -#include "SPIRV/spirv.hpp"
10 +#include "glslang/SPIRV/spirv.hpp"
11
12 #include "libshaderc_util/compiler.h"
13 #include "libshaderc_util/counting_includer.h"
14 diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
15 index ef7867f..acc172b 100644
16 --- a/libshaderc_util/src/compiler.cc
17 +++ b/libshaderc_util/src/compiler.cc
18 @@ -26,7 +26,7 @@
19 #include "libshaderc_util/string_piece.h"
20 #include "libshaderc_util/version_profile.h"
21
22 -#include "SPIRV/GlslangToSpv.h"
23 +#include "glslang/SPIRV/GlslangToSpv.h"
24
25 namespace {
26 using shaderc_util::string_piece;
27 @@ -291,17 +291,12 @@ std::tuple<bool, std::vector<uint32_t>, size_t> Compiler::Compile(
28 bases[static_cast<int>(UniformKind::StorageBuffer)]);
29 shader.setShiftUavBinding(
30 bases[static_cast<int>(UniformKind::UnorderedAccessView)]);
31 - shader.setHlslIoMapping(hlsl_iomap_);
32 shader.setResourceSetBinding(
33 hlsl_explicit_bindings_[static_cast<int>(used_shader_stage)]);
34 shader.setEnvClient(target_client_info.client,
35 target_client_info.client_version);
36 shader.setEnvTarget(target_client_info.target_language,
37 target_client_info.target_language_version);
38 - if (hlsl_functionality1_enabled_) {
39 - shader.setEnvTargetHlslFunctionality1();
40 - }
41 -
42 const EShMessages rules = GetMessageRules(target_env_, source_language_,
43 hlsl_offsets_,
44 generate_debug_info_);
45 @@ -478,9 +473,6 @@ std::tuple<bool, std::string, std::string> Compiler::PreprocessShader(
46 }
47 shader.setEnvClient(target_client_info.client,
48 target_client_info.client_version);
49 - if (hlsl_functionality1_enabled_) {
50 - shader.setEnvTargetHlslFunctionality1();
51 - }
52
53 // The preprocessor might be sensitive to the target environment.
54 // So combine the existing rules with the just-give-me-preprocessor-output
|
