Vulkan backend cleanup

overte-org · Dec 15, 2024 · 53ea3a5 · 53ea3a5
1 parent e23623e
commit 53ea3a5
Show file tree

Hide file tree

Showing 20 changed files with 12 additions and 1,519 deletions.
diff --git a/libraries/display-plugins/src/display-plugins/VulkanDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/VulkanDisplayPlugin.cpp
@@ -903,9 +903,6 @@ void VulkanDisplayPlugin::present(const std::shared_ptr<RefreshRateController>&
         vkBackend->waitForGPU();
         vkBackend->recycleFrame();
 
-        vkBackend->getContext().emptyDumpster(frameFence);
-        vkBackend->getContext().recycle();
-
         gpu::Backend::freeGPUMemSize.set(gpu::gl::getFreeDedicatedMemory());
     } else if (alwaysPresent()) {
         refreshRateController->clockEndTime();

diff --git a/libraries/gpu-vk/src/gpu/vk/VKBackend.h b/libraries/gpu-vk/src/gpu/vk/VKBackend.h
@@ -23,7 +23,6 @@
 #include <vk/Config.h>
 #include <vk/Context.h>
 #include <vk/VulkanDebug.h>
-#include <vk/VulkanTexture.h>
 #include <vulkan/vulkan_core.h>
 
 #include "VKForward.h"

diff --git a/libraries/gpu-vk/src/gpu/vk/VKFramebuffer.h b/libraries/gpu-vk/src/gpu/vk/VKFramebuffer.h
@@ -10,13 +10,11 @@
 
 #include "VKShared.h"
 #include "VKBackend.h"
-#include <vk/VulkanFrameBuffer.hpp>
 
 namespace gpu { namespace vk {
 
 class VKFramebuffer : public vk::VKObject<Framebuffer> {
 public:
-    //vks::Framebuffer vksFrameBuffer;
     VkRenderPass vkRenderPass {VK_NULL_HANDLE};
     VkFramebuffer vkFramebuffer {VK_NULL_HANDLE};
 
@@ -49,24 +47,8 @@ class VKFramebuffer : public vk::VKObject<Framebuffer> {
         return object;
     }
 
-    // VKTODO: what type should it return?
-    template <typename VKFramebufferType>
-    static uint32_t getId(vk::VKBackend& backend, const Framebuffer& framebuffer) {
-        VKFramebufferType* fbo = sync(backend, framebuffer);
-        if (fbo) {
-            return fbo->_id;
-        } else {
-            return 0;
-        }
-    }
-
-    // VKTODO: probably a Vulkan handle instead of this
-    //const VKuint& _fbo { _id };
-    //std::vector<VKenum> _colorBuffers;
     Stamp _depthStamp { 0 };
     std::vector<Stamp> _colorStamps;
-    // Contains attachment number?
-    //std::vector<uint32_t> _colorBuffers;
 
     // From VKS
     struct FramebufferAttachment
@@ -139,7 +121,6 @@ class VKFramebuffer : public vk::VKObject<Framebuffer> {
 
     // VKTODO: We need a check on backend.lock(), or to pass backend reference instead
     VKFramebuffer(const std::weak_ptr<vk::VKBackend>& backend, const Framebuffer& framebuffer) : VKObject(*backend.lock(), framebuffer) {}
-        //vksFrameBuffer(backend.lock()->getContext().device.get()){}
     // VKTODO: Do we need virtual destructor here?
     ~VKFramebuffer();
 

diff --git a/libraries/gpu-vk/src/gpu/vk/VKShader.h b/libraries/gpu-vk/src/gpu/vk/VKShader.h
@@ -12,7 +12,8 @@
 
 namespace gpu { namespace vk {
 
-class VKShader : public GPUObject {
+// VKTODO:
+/*class VKShader : public GPUObject {
 public:
     static VKShader* sync(VKBackend& backend, const Shader& shader);
     static bool makeProgram(VKBackend& backend, Shader& shader, const Shader::BindingSet& slotBindings);
@@ -45,7 +46,7 @@ class VKShader : public GPUObject {
     }
 
     const std::weak_ptr<VKBackend> _backend;
-};
+};*/
 
 } }
 

diff --git a/libraries/vk/src/vk/Allocation.h b/libraries/vk/src/vk/Allocation.h
@@ -49,7 +49,7 @@ namespace vks {
         static VmaAllocator& getAllocator();
 
         VmaAllocation allocation;
-        /** @brief Memory propertys flags to be filled by external source at buffer creation (to query at some later point) */
+        /** @brief Memory properties flags to be filled by external source at buffer creation (to query at some later point) */
         VkMemoryPropertyFlags memoryPropertyFlags;
 #else
         VkDeviceMemory memory;