diff options
| author | asuonpaa <34128694+asuonpaa@users.noreply.github.com> | 2020-08-21 16:07:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 14:07:13 +0100 |
| commit | f02ecc0f5f7844c8c8557a3b773e1fab12a64747 (patch) | |
| tree | b06bc994c920063ab214bfe1d1ff3fba2234518f | |
| parent | 97e58d80577f60179450bf050168a9a40475db9c (diff) | |
| download | amber-f02ecc0f5f7844c8c8557a3b773e1fab12a64747.tar.gz | |
Fix compilation errors when using Amber library in Vulkan CTS (#904)
| -rw-r--r-- | src/shader_compiler.cc | 9 | ||||
| -rw-r--r-- | src/shader_compiler.h | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/shader_compiler.cc b/src/shader_compiler.cc index b0bb44a..8f0d8a4 100644 --- a/src/shader_compiler.cc +++ b/src/shader_compiler.cc @@ -39,7 +39,7 @@ #include "src/dxc_helper.h" #endif // AMBER_ENABLE_DXC -#ifdef AMBER_ENABLE_CLSPV +#if AMBER_ENABLE_CLSPV #include "src/clspv_helper.h" #endif // AMBER_ENABLE_CLSPV @@ -292,13 +292,6 @@ Result ShaderCompiler::CompileOpenCLC(Pipeline::ShaderInfo* shader_info, std::vector<uint32_t>* result) const { return clspvhelper::Compile(shader_info, pipeline, env, result); } -#else -Result ShaderCompiler::CompileOpenCLC(Pipeline::ShaderInfo*, - Pipeline*, - spv_target_env, - std::vector<uint32_t>*) const { - return {}; -} #endif // AMBER_ENABLE_CLSPV namespace { diff --git a/src/shader_compiler.h b/src/shader_compiler.h index e5c6ee2..849f731 100644 --- a/src/shader_compiler.h +++ b/src/shader_compiler.h @@ -21,7 +21,9 @@ #include "amber/amber.h" #include "amber/result.h" +#if AMBER_ENABLE_CLSPV #include "spirv-tools/libspirv.h" +#endif #include "src/pipeline.h" #include "src/shader.h" #include "src/virtual_file_store.h" @@ -59,10 +61,12 @@ class ShaderCompiler { Result ParseHex(const std::string& data, std::vector<uint32_t>* result) const; Result CompileGlsl(const Shader* shader, std::vector<uint32_t>* result) const; Result CompileHlsl(const Shader* shader, std::vector<uint32_t>* result) const; +#if AMBER_ENABLE_CLSPV Result CompileOpenCLC(Pipeline::ShaderInfo* shader, Pipeline* pipeline, spv_target_env env, std::vector<uint32_t>* result) const; +#endif std::string spv_env_; bool disable_spirv_validation_ = false; |