diff options
Diffstat (limited to 'src/rendering')
| -rw-r--r-- | src/rendering/shader.cpp | 11 | ||||
| -rw-r--r-- | src/rendering/shader.h | 11 | ||||
| -rw-r--r-- | src/rendering/texture.h | 4 |
3 files changed, 25 insertions, 1 deletions
diff --git a/src/rendering/shader.cpp b/src/rendering/shader.cpp index 10f6c49..d3fef07 100644 --- a/src/rendering/shader.cpp +++ b/src/rendering/shader.cpp @@ -27,6 +27,17 @@ namespace Donut } } + Shader* Shader::create_compute(const std::string& name, const std::string& compute_src) + { + switch (Renderer::get_api()) + { + case RendererAPI::API::OpenGL: + return new OpenGLShader(name, compute_src); + default: + return nullptr; + } + } + void ShaderLibrary::add(const std::shared_ptr<Shader>& shader) { auto& name = shader->get_name(); diff --git a/src/rendering/shader.h b/src/rendering/shader.h index d9128f6..fe869ba 100644 --- a/src/rendering/shader.h +++ b/src/rendering/shader.h @@ -5,6 +5,11 @@ #include <memory> #include <glm/glm.hpp> +#define SHADER_STORAGE_BARRIER_BIT 0x00002000 +#define UNIFORM_BARRIER_BIT 0x00000004 +#define TEXTURE_FETCH_BARRIER_BIT 0x00000008 +#define IMAGE_ACCESS_BARRIER_BIT 0x00000020 + namespace Donut { class Shader @@ -18,14 +23,20 @@ namespace Donut virtual void set_int(const std::string& name, int value) = 0; virtual void set_int_array(const std::string& name, int* values, uint32_t count) = 0; virtual void set_float(const std::string& name, float value) = 0; + virtual void set_float2(const std::string& name, const glm::vec2& value) = 0; virtual void set_float3(const std::string& name, const glm::vec3& value) = 0; virtual void set_float4(const std::string& name, const glm::vec4& value) = 0; virtual void set_mat4(const std::string& name, const glm::mat4& value) = 0; + virtual void dispatch(uint32_t x, uint32_t y = 1, uint32_t z = 1) = 0; + virtual void dispatch_indirect(uint32_t offset = 0) = 0; + virtual void memory_barrier(uint32_t barriers) = 0; + virtual const std::string& get_name() const = 0; static Shader* create(const std::string& filepath); static Shader* create(const std::string& name, const std::string& vertex_src, const std::string& fragment_src); + static Shader* create_compute(const std::string& name, const std::string& compute_src); }; class ShaderLibrary diff --git a/src/rendering/texture.h b/src/rendering/texture.h index e3c53f8..68866b5 100644 --- a/src/rendering/texture.h +++ b/src/rendering/texture.h @@ -17,11 +17,13 @@ namespace Donut virtual void set_data(void* data, uint32_t size) = 0; virtual void bind(uint32_t slot = 0) const = 0; + virtual void bind_as_image(uint32_t slot = 0, bool read_only = false) const = 0; virtual bool operator==(const Texture& other) const = 0; }; - class Texture2D : public Texture + class Texture2D + : public Texture { public: static std::shared_ptr<Texture2D> create(uint32_t width, uint32_t height); |
