diff options
Diffstat (limited to 'src/Platform/Vulkan')
| -rw-r--r-- | src/Platform/Vulkan/VulkanShader.h | 1 | ||||
| -rw-r--r-- | src/Platform/Vulkan/VulkanTexture.cpp | 49 | ||||
| -rw-r--r-- | src/Platform/Vulkan/VulkanTexture.h | 27 |
3 files changed, 71 insertions, 6 deletions
diff --git a/src/Platform/Vulkan/VulkanShader.h b/src/Platform/Vulkan/VulkanShader.h index 2b75331..138a742 100644 --- a/src/Platform/Vulkan/VulkanShader.h +++ b/src/Platform/Vulkan/VulkanShader.h @@ -32,6 +32,7 @@ namespace Donut virtual void MemoryBarrier(uint32_t barriers) override; virtual const std::string& GetName() const override { return m_Name; } + virtual uint32_t GetRendererID() const override { return m_RendererID; } void UploadUniformInt(const std::string& name, int value); void UploadUniformIntArray(const std::string& name, int* values, uint32_t count); diff --git a/src/Platform/Vulkan/VulkanTexture.cpp b/src/Platform/Vulkan/VulkanTexture.cpp index 623e540..4145130 100644 --- a/src/Platform/Vulkan/VulkanTexture.cpp +++ b/src/Platform/Vulkan/VulkanTexture.cpp @@ -5,32 +5,69 @@ namespace Donut VulkanTexture2D::VulkanTexture2D(uint32_t width, uint32_t height) : m_Width(width), m_Height(height) { - // TODO(Hachem): Implement Vulkan texture creation with dimensions + m_InternalFormat = 0; + m_DataFormat = 0; + m_RendererID = 0; } VulkanTexture2D::VulkanTexture2D(const std::string& path) : m_Path(path) { - // TODO(Hachem): Implement Vulkan texture creation from file + m_Width = 1; + m_Height = 1; + m_InternalFormat = 0; + m_DataFormat = 0; + m_RendererID = 0; } VulkanTexture2D::~VulkanTexture2D() { - // TODO(Hachem): Implement Vulkan texture cleanup } void VulkanTexture2D::SetData(void* data, uint32_t size) { - // TODO(Hachem): Implement Vulkan texture data setting } void VulkanTexture2D::Bind(uint32_t slot) const { - // TODO(Hachem): Implement Vulkan texture binding } void VulkanTexture2D::BindAsImage(uint32_t slot, bool readOnly) const { - // TODO(Hachem): Implement Vulkan texture image binding + } + + // Vulkan Cubemap Implementation (Placeholder) + VulkanCubemapTexture::VulkanCubemapTexture(uint32_t width, uint32_t height) + : m_Width(width), m_Height(height) + { + m_InternalFormat = 0; + m_DataFormat = 0; + m_RendererID = 0; + } + + VulkanCubemapTexture::VulkanCubemapTexture(const std::string& path) + : m_Path(path) + { + m_Width = 1024; + m_Height = 1024; + m_InternalFormat = 0; + m_DataFormat = 0; + m_RendererID = 0; + } + + VulkanCubemapTexture::~VulkanCubemapTexture() + { + } + + void VulkanCubemapTexture::SetData(void* data, uint32_t size) + { + } + + void VulkanCubemapTexture::Bind(uint32_t slot) const + { + } + + void VulkanCubemapTexture::BindAsImage(uint32_t slot, bool readOnly) const + { } }; diff --git a/src/Platform/Vulkan/VulkanTexture.h b/src/Platform/Vulkan/VulkanTexture.h index ad711f9..dd9e1df 100644 --- a/src/Platform/Vulkan/VulkanTexture.h +++ b/src/Platform/Vulkan/VulkanTexture.h @@ -30,4 +30,31 @@ namespace Donut uint32_t m_RendererID; uint32_t m_InternalFormat, m_DataFormat; }; + + class VulkanCubemapTexture + : public CubemapTexture + { + public: + VulkanCubemapTexture(uint32_t width, uint32_t height); + VulkanCubemapTexture(const std::string& path); + virtual ~VulkanCubemapTexture(); + + virtual uint32_t GetWidth() const override { return m_Width; } + virtual uint32_t GetHeight() const override { return m_Height; } + virtual uint32_t GetRendererID() const override { return m_RendererID; } + + virtual void SetData(void* data, uint32_t size) override; + virtual void Bind(uint32_t slot = 0) const override; + virtual void BindAsImage(uint32_t slot = 0, bool readOnly = false) const override; + + virtual bool operator==(const Texture& other) const override + { + return m_RendererID == ((VulkanCubemapTexture&)other).m_RendererID; + } + private: + std::string m_Path; + uint32_t m_Width, m_Height; + uint32_t m_RendererID; + uint32_t m_InternalFormat, m_DataFormat; + }; }; |
