Descriptor sets and refactoring

2024-04-13 23:51:38 +02:00
parent efb2c0e169
commit f5eb12a5de
31 changed files with 1688 additions and 1365 deletions
@@ -1,144 +1,114 @@
 #pragma once
 #include "Resources.h"

-namespace Seele
-{
-namespace Gfx
-{
-class Buffer : public QueueOwnedResource
-{
+namespace Seele {
+namespace Gfx {
+class Buffer : public QueueOwnedResource {
 public:
-    Buffer(QueueFamilyMapping mapping, QueueType startQueueType);
-    virtual ~Buffer();
-    virtual void beginFrame() = 0;
+  Buffer(QueueFamilyMapping mapping, QueueType startQueueType);
+  virtual ~Buffer();
+
 protected:
-    // Inherited via QueueOwnedResource
-    virtual void executeOwnershipBarrier(QueueType newOwner) = 0;
+  // Inherited via QueueOwnedResource
+  virtual void executeOwnershipBarrier(QueueType newOwner) = 0;
 };

-class VertexBuffer : public Buffer
-{
+class VertexBuffer : public Buffer {
 public:
-    VertexBuffer(QueueFamilyMapping mapping, uint32 numVertices, uint32 vertexSize, QueueType startQueueType);
-    virtual ~VertexBuffer();
-    constexpr uint32 getNumVertices() const
-    {
-        return numVertices;
-    }
-    // Size of one vertex in bytes
-    constexpr uint32 getVertexSize() const
-    {
-        return vertexSize;
-    }
+  VertexBuffer(QueueFamilyMapping mapping, uint32 numVertices, uint32 vertexSize, QueueType startQueueType);
+  virtual ~VertexBuffer();
+  constexpr uint32 getNumVertices() const { return numVertices; }
+  // Size of one vertex in bytes
+  constexpr uint32 getVertexSize() const { return vertexSize; }
+
+  virtual void updateRegion(DataSource update) = 0;
+  virtual void download(Array<uint8>& buffer) = 0;

-    virtual void updateRegion(DataSource update) = 0;
-    virtual void download(Array<uint8>& buffer) = 0;
-    virtual void beginFrame() = 0;
 protected:
-    // Inherited via QueueOwnedResource
-    virtual void executeOwnershipBarrier(QueueType newOwner) = 0;
-    virtual void executePipelineBarrier(SeAccessFlags srcAccess, SePipelineStageFlags srcStage, 
-        SeAccessFlags dstAccess, SePipelineStageFlags dstStage) = 0;
-    uint32 numVertices;
-    uint32 vertexSize;
+  // Inherited via QueueOwnedResource
+  virtual void executeOwnershipBarrier(QueueType newOwner) = 0;
+  virtual void executePipelineBarrier(SeAccessFlags srcAccess, SePipelineStageFlags srcStage, SeAccessFlags dstAccess,
+                                      SePipelineStageFlags dstStage) = 0;
+  uint32 numVertices;
+  uint32 vertexSize;
 };
 DEFINE_REF(VertexBuffer)

-class IndexBuffer : public Buffer
-{
+class IndexBuffer : public Buffer {
 public:
-    IndexBuffer(QueueFamilyMapping mapping, uint64 size, Gfx::SeIndexType index, QueueType startQueueType);
-    virtual ~IndexBuffer();
-    constexpr uint64 getNumIndices() const
-    {
-        return numIndices;
-    }
-    constexpr Gfx::SeIndexType getIndexType() const
-    {
-        return indexType;
-    }
+  IndexBuffer(QueueFamilyMapping mapping, uint64 size, Gfx::SeIndexType index, QueueType startQueueType);
+  virtual ~IndexBuffer();
+  constexpr uint64 getNumIndices() const { return numIndices; }
+  constexpr Gfx::SeIndexType getIndexType() const { return indexType; }
+
+  virtual void download(Array<uint8>& buffer) = 0;

-    virtual void download(Array<uint8>& buffer) = 0;
-    virtual void beginFrame() = 0;
 protected:
-    // Inherited via QueueOwnedResource
-    virtual void executeOwnershipBarrier(QueueType newOwner) = 0;
-    virtual void executePipelineBarrier(SeAccessFlags srcAccess, SePipelineStageFlags srcStage, 
-        SeAccessFlags dstAccess, SePipelineStageFlags dstStage) = 0;
-    Gfx::SeIndexType indexType;
-    uint64 numIndices;
+  // Inherited via QueueOwnedResource
+  virtual void executeOwnershipBarrier(QueueType newOwner) = 0;
+  virtual void executePipelineBarrier(SeAccessFlags srcAccess, SePipelineStageFlags srcStage, SeAccessFlags dstAccess,
+                                      SePipelineStageFlags dstStage) = 0;
+  Gfx::SeIndexType indexType;
+  uint64 numIndices;
 };
 DEFINE_REF(IndexBuffer)

 DECLARE_REF(UniformBuffer)
-class UniformBuffer : public Buffer
-{
+class UniformBuffer : public Buffer {
 public:
-    UniformBuffer(QueueFamilyMapping mapping, const DataSource& sourceData);
-    virtual ~UniformBuffer();
-    // returns true if an update was performed, false if the old contents == new contents
-    virtual bool updateContents(const DataSource& sourceData);
-    bool isDataEquals(PUniformBuffer other)
-    {
-        if (other == nullptr)
-        {
-            return false;
-        }
-        if (contents.size() != other->contents.size())
-        {
-            return false;
-        }
-        if (std::memcmp(contents.data(), other->contents.data(), contents.size()) != 0)
-        {
-            return false;
-        }
-        return true;
+  UniformBuffer(QueueFamilyMapping mapping, const DataSource& sourceData);
+  virtual ~UniformBuffer();
+  // returns true if an update was performed, false if the old contents == new contents
+  virtual bool updateContents(const DataSource& sourceData);
+  bool isDataEquals(PUniformBuffer other) {
+    if (other == nullptr) {
+      return false;
    }
-    virtual void beginFrame() = 0;
+    if (contents.size() != other->contents.size()) {
+      return false;
+    }
+    if (std::memcmp(contents.data(), other->contents.data(), contents.size()) != 0) {
+      return false;
+    }
+    return true;
+  }
+
 protected:
-    Array<uint8> contents;
-    // Inherited via QueueOwnedResource
-    virtual void executeOwnershipBarrier(QueueType newOwner) = 0;
-    virtual void executePipelineBarrier(SeAccessFlags srcAccess, SePipelineStageFlags srcStage,
-        SeAccessFlags dstAccess, SePipelineStageFlags dstStage) = 0;
+  Array<uint8> contents;
+  // Inherited via QueueOwnedResource
+  virtual void executeOwnershipBarrier(QueueType newOwner) = 0;
+  virtual void executePipelineBarrier(SeAccessFlags srcAccess, SePipelineStageFlags srcStage, SeAccessFlags dstAccess,
+                                      SePipelineStageFlags dstStage) = 0;
 };
 DEFINE_REF(UniformBuffer)
-class ShaderBuffer : public Buffer
-{
+class ShaderBuffer : public Buffer {
 public:
-    ShaderBuffer(QueueFamilyMapping mapping, uint32 numElements, const DataSource& bulkResourceData);
-    virtual ~ShaderBuffer();
-    virtual bool updateContents(const DataSource& sourceData);
-    bool isDataEquals(ShaderBuffer* other)
-    {
-        if(other == nullptr)
-        {
-            return false;
-        }
-        if(contents.size() != other->contents.size())
-        {
-            return false;
-        }
-        if(std::memcmp(contents.data(), other->contents.data(), contents.size()) != 0)
-        {
-            return false;
-        }
-        return true;
+  ShaderBuffer(QueueFamilyMapping mapping, uint32 numElements, const DataSource& bulkResourceData);
+  virtual ~ShaderBuffer();
+  virtual bool updateContents(const DataSource& sourceData);
+  bool isDataEquals(ShaderBuffer* other) {
+    if (other == nullptr) {
+      return false;
    }
-    constexpr uint32 getNumElements() const
-    {
-        return numElements;
+    if (contents.size() != other->contents.size()) {
+      return false;
    }
-    virtual void beginFrame() = 0;
+    if (std::memcmp(contents.data(), other->contents.data(), contents.size()) != 0) {
+      return false;
+    }
+    return true;
+  }
+  constexpr uint32 getNumElements() const { return numElements; }
+
 protected:
-    // Inherited via QueueOwnedResource
-    virtual void executeOwnershipBarrier(QueueType newOwner) = 0;
-    virtual void executePipelineBarrier(SeAccessFlags srcAccess, SePipelineStageFlags srcStage, 
-        SeAccessFlags dstAccess, SePipelineStageFlags dstStage) = 0;
-    
-    Array<uint8> contents;
-    uint32 numElements;
+  // Inherited via QueueOwnedResource
+  virtual void executeOwnershipBarrier(QueueType newOwner) = 0;
+  virtual void executePipelineBarrier(SeAccessFlags srcAccess, SePipelineStageFlags srcStage, SeAccessFlags dstAccess,
+                                      SePipelineStageFlags dstStage) = 0;
+
+  Array<uint8> contents;
+  uint32 numElements;
 };
 DEFINE_REF(ShaderBuffer)
-}
-}
+} // namespace Gfx
+} // namespace Seele