diff options
| author | alan-baker <33432579+alan-baker@users.noreply.github.com> | 2019-07-19 15:35:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-19 15:35:22 -0400 |
| commit | 695979920cd860460703787369a87987b837a0cf (patch) | |
| tree | e0b5a3bb76ef165816c627e208cbe270768c5ce6 /src/shader_compiler.h | |
| parent | e7035ef87a71c70b15bb31af6708581f9ce78675 (diff) | |
| download | amber-695979920cd860460703787369a87987b837a0cf.tar.gz | |
Bind opencl buffers (#584)
Fixes #426
* New BIND subcommands to specify kernel args by name or ordinal
* storage class specification is optional, but checked for consistency
* clspv compiles parse descriptor map (partially) into
Pipeline::ShaderInfo
* Bindings updated before pipeline creation
* added compiler and pipeline tests for new functionality
* added new end-to-end test
* Add documentation
* Buffer storage class specification is now optional for OpenCL-C
Diffstat (limited to 'src/shader_compiler.h')
| -rw-r--r-- | src/shader_compiler.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/shader_compiler.h b/src/shader_compiler.h index 3c4b56f..a6dc8f8 100644 --- a/src/shader_compiler.h +++ b/src/shader_compiler.h @@ -21,6 +21,7 @@ #include "amber/amber.h" #include "amber/result.h" +#include "src/pipeline.h" #include "src/shader.h" namespace amber { @@ -37,14 +38,14 @@ class ShaderCompiler { /// compilation result is copied from that entry. Otherwise a compiler is /// invoked to produce the compilation result. std::pair<Result, std::vector<uint32_t>> Compile( - const Shader* shader, + Pipeline::ShaderInfo* shader_info, const ShaderMap& shader_map) const; private: 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; - Result CompileOpenCLC(const Shader* shader, + Result CompileOpenCLC(Pipeline::ShaderInfo* shader, std::vector<uint32_t>* result) const; std::string spv_env_; |