More metal changes

2024-04-09 18:24:21 +02:00
parent 2359b1e984
commit a0161f1d83
5 changed files with 297 additions and 83 deletions
@@ -76,36 +76,127 @@ protected:
    friend class Graphics;
 };
 DEFINE_REF(TextureBase)
-class Texture2D : public Gfx::Texture2D
+class Texture2D : public Gfx::Texture2D, public TextureBase
 {
 public:
-    Texture2D(PGraphics graphics, const TextureCreateInfo& createInfo, MTL::Texture* existingImage = nullptr);
+    Texture2D(PGraphics graphics, const TextureCreateInfo& createInfo, MTL::Texture* exisitingTexture = nullptr);
    virtual ~Texture2D();
-
-    virtual Gfx::SeFormat getFormat() const override;
-    virtual uint32 getWidth() const override;
-    virtual uint32 getHeight() const override;
-    virtual uint32 getDepth() const override;
-    virtual Gfx::SeSampleCountFlags getNumSamples() const override;
-    virtual uint32 getMipLevels() const override;
+    virtual uint32 getWidth() const override
+    {
+        return width;
+    }
+    virtual uint32 getHeight() const override
+    {
+        return height;
+    }
+    virtual uint32 getDepth() const override
+    {
+        return depth;
+    }
+    virtual Gfx::SeFormat getFormat() const override
+    {
+        return format;
+    }
+    virtual Gfx::SeSampleCountFlags getNumSamples() const override
+    {
+        return samples;
+    }
+    virtual uint32 getMipLevels() const override
+    {
+        return mipLevels;
+    }
    virtual void changeLayout(Gfx::SeImageLayout newLayout, 
        Gfx::SeAccessFlags srcAccess, Gfx::SePipelineStageFlags srcStage,
        Gfx::SeAccessFlags dstAccess, Gfx::SePipelineStageFlags dstStage) override;
+    virtual void download(uint32 mipLevel, uint32 arrayLayer, uint32 face, Array<uint8>& buffer) override;
+
 protected:
-    //Inherited via QueueOwnedResource
+    // Inherited via QueueOwnedResource
    virtual void executeOwnershipBarrier(Gfx::QueueType newOwner) override;
    virtual void executePipelineBarrier(Gfx::SeAccessFlags srcAccess, Gfx::SePipelineStageFlags srcStage, 
        Gfx::SeAccessFlags dstAccess, Gfx::SePipelineStageFlags dstStage) override;
 };
 DEFINE_REF(Texture2D)
-class Texture3D : public Gfx::Texture3D
+class Texture3D : public Gfx::Texture3D, public TextureBase
 {
+public:
+    Texture3D(PGraphics graphics, const TextureCreateInfo& createInfo);
+    virtual ~Texture3D();
+    virtual uint32 getWidth() const override
+    {
+        return width;
+    }
+    virtual uint32 getHeight() const override
+    {
+        return height;
+    }
+    virtual uint32 getDepth() const override
+    {
+        return depth;
+    }
+    virtual Gfx::SeFormat getFormat() const override
+    {
+        return format;
+    }
+    virtual Gfx::SeSampleCountFlags getNumSamples() const override
+    {
+        return samples;
+    }
+    virtual uint32 getMipLevels() const override
+    {
+        return mipLevels;
+    }
+    virtual void changeLayout(Gfx::SeImageLayout newLayout, 
+        Gfx::SeAccessFlags srcAccess, Gfx::SePipelineStageFlags srcStage,
+        Gfx::SeAccessFlags dstAccess, Gfx::SePipelineStageFlags dstStage) override;
+    virtual void download(uint32 mipLevel, uint32 arrayLayer, uint32 face, Array<uint8>& buffer) override;
+
+protected:
+    // Inherited via QueueOwnedResource
+    virtual void executeOwnershipBarrier(Gfx::QueueType newOwner) override;
+    virtual void executePipelineBarrier(Gfx::SeAccessFlags srcAccess, Gfx::SePipelineStageFlags srcStage, 
+        Gfx::SeAccessFlags dstAccess, Gfx::SePipelineStageFlags dstStage) override;

 };
 DEFINE_REF(Texture3D)
-class TextureCube : public Gfx::TextureCube
+class TextureCube : public Gfx::TextureCube, TextureBase
 {
-
+public:
+    TextureCube(PGraphics graphics, const TextureCreateInfo& createInfo);
+    virtual ~TextureCube();
+    virtual uint32 getWidth() const override
+    {
+        return width;
+    }
+    virtual uint32 getHeight() const override
+    {
+        return height;
+    }
+    virtual uint32 getDepth() const override
+    {
+        return depth;
+    }
+    virtual Gfx::SeFormat getFormat() const override
+    {
+        return format;
+    }
+    virtual Gfx::SeSampleCountFlags getNumSamples() const override
+    {
+        return samples;
+    }
+    virtual uint32 getMipLevels() const override
+    {
+        return mipLevels;
+    }
+    virtual void changeLayout(Gfx::SeImageLayout newLayout, 
+        Gfx::SeAccessFlags srcAccess, Gfx::SePipelineStageFlags srcStage,
+        Gfx::SeAccessFlags dstAccess, Gfx::SePipelineStageFlags dstStage) override;
+    virtual void download(uint32 mipLevel, uint32 arrayLayer, uint32 face, Array<uint8>& buffer) override;
+protected:
+    // Inherited via QueueOwnedResource
+    virtual void executeOwnershipBarrier(Gfx::QueueType newOwner) override;
+    virtual void executePipelineBarrier(Gfx::SeAccessFlags srcAccess, Gfx::SePipelineStageFlags srcStage, 
+        Gfx::SeAccessFlags dstAccess, Gfx::SePipelineStageFlags dstStage) override;
 };
 DEFINE_REF(TextureCube)
 }