aboutsummaryrefslogtreecommitdiff
path: root/src/Rendering
diff options
context:
space:
mode:
Diffstat (limited to 'src/Rendering')
-rw-r--r--src/Rendering/Shader.cpp11
-rw-r--r--src/Rendering/Shader.h11
-rw-r--r--src/Rendering/Texture.h4
3 files changed, 25 insertions, 1 deletions
diff --git a/src/Rendering/Shader.cpp b/src/Rendering/Shader.cpp
index b055fe4..a791c98 100644
--- a/src/Rendering/Shader.cpp
+++ b/src/Rendering/Shader.cpp
@@ -27,6 +27,17 @@ namespace Donut
}
}
+ Shader* Shader::CreateCompute(const std::string& name, const std::string& computeSrc)
+ {
+ switch (Renderer::GetAPI())
+ {
+ case RendererAPI::API::OpenGL:
+ return new OpenGLShader(name, computeSrc);
+ default:
+ return nullptr;
+ }
+ }
+
void ShaderLibrary::Add(const std::shared_ptr<Shader>& shader)
{
auto& name = shader->GetName();
diff --git a/src/Rendering/Shader.h b/src/Rendering/Shader.h
index a6b287a..aa46f07 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 SetInt(const std::string& name, int value) = 0;
virtual void SetIntArray(const std::string& name, int* values, uint32_t count) = 0;
virtual void SetFloat(const std::string& name, float value) = 0;
+ virtual void SetFloat2(const std::string& name, const glm::vec2& value) = 0;
virtual void SetFloat3(const std::string& name, const glm::vec3& value) = 0;
virtual void SetFloat4(const std::string& name, const glm::vec4& value) = 0;
virtual void SetMat4(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 DispatchIndirect(uint32_t offset = 0) = 0;
+ virtual void MemoryBarrier(uint32_t barriers) = 0;
+
virtual const std::string& GetName() const = 0;
static Shader* Create(const std::string& filepath);
static Shader* Create(const std::string& name, const std::string& vertexSrc, const std::string& fragmentSrc);
+ static Shader* CreateCompute(const std::string& name, const std::string& computeSrc);
};
class ShaderLibrary
diff --git a/src/Rendering/Texture.h b/src/Rendering/Texture.h
index eebce85..f17bb1d 100644
--- a/src/Rendering/Texture.h
+++ b/src/Rendering/Texture.h
@@ -17,11 +17,13 @@ namespace Donut
virtual void SetData(void* data, uint32_t size) = 0;
virtual void Bind(uint32_t slot = 0) const = 0;
+ virtual void BindAsImage(uint32_t slot = 0, bool readOnly = 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);