vulkan: clean-up includes and simplify destruct

google · Aug 9, 2023 · c409382 · c409382
1 parent 96cccc8
commit c409382
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 18 deletions.
diff --git a/filament/backend/src/vulkan/VulkanBlitter.cpp b/filament/backend/src/vulkan/VulkanBlitter.cpp
@@ -16,7 +16,9 @@
 
 #include "VulkanBlitter.h"
 #include "VulkanContext.h"
+#include "VulkanFboCache.h"
 #include "VulkanHandles.h"
+#include "VulkanSamplerCache.h"
 
 #include <utils/FixedCapacityVector.h>
 #include <utils/Panic.h>

diff --git a/filament/backend/src/vulkan/VulkanCommands.cpp b/filament/backend/src/vulkan/VulkanCommands.cpp
@@ -23,7 +23,6 @@
 
 #include "VulkanConstants.h"
 #include "VulkanContext.h"
-#include "VulkanDriver.h"
 
 #include <utils/Log.h>
 #include <utils/Panic.h>

diff --git a/filament/backend/src/vulkan/VulkanCommands.h b/filament/backend/src/vulkan/VulkanCommands.h
@@ -19,6 +19,8 @@
 
 #include <bluevk/BlueVK.h>
 
+#include "DriverBase.h"
+
 #include "VulkanConstants.h"
 
 #include <utils/Condition.h>

diff --git a/filament/backend/src/vulkan/VulkanDriver.cpp b/filament/backend/src/vulkan/VulkanDriver.cpp
@@ -340,7 +340,7 @@ void VulkanDriver::createIndexBufferR(Handle<HwIndexBuffer> ibh, ElementType ele
     auto indexBuffer = construct<VulkanIndexBuffer>(ibh, mAllocator, mCommands.get(), mStagePool,
             elementSize, indexCount);
     mDisposer.createDisposable(indexBuffer,
-            [this, ibh]() { destructBuffer<VulkanIndexBuffer>(ibh); });
+            [this, ibh]() { destruct<VulkanIndexBuffer>(ibh); });
 }
 
 void VulkanDriver::destroyIndexBuffer(Handle<HwIndexBuffer> ibh) {
@@ -355,7 +355,7 @@ void VulkanDriver::createBufferObjectR(Handle<HwBufferObject> boh, uint32_t byte
     auto bufferObject = construct<VulkanBufferObject>(boh, mAllocator, mCommands.get(), mStagePool,
             byteCount, bindingType, usage);
     mDisposer.createDisposable(bufferObject,
-            [this, boh]() { destructBuffer<VulkanBufferObject>(boh); });
+            [this, boh]() { destruct<VulkanBufferObject>(boh); });
 }
 
 void VulkanDriver::destroyBufferObject(Handle<HwBufferObject> boh) {

diff --git a/filament/backend/src/vulkan/VulkanDriver.h b/filament/backend/src/vulkan/VulkanDriver.h
@@ -23,6 +23,7 @@
 #include "VulkanConstants.h"
 #include "VulkanContext.h"
 #include "VulkanFboCache.h"
+#include "VulkanHandles.h"
 #include "VulkanReadPixels.h"
 #include "VulkanSamplerCache.h"
 #include "VulkanStagePool.h"
@@ -118,18 +119,14 @@ class VulkanDriver final : public DriverBase {
 
     template<typename D, typename B>
     void destruct(Handle<B> handle) noexcept {
+        if constexpr (std::is_base_of_v<VulkanIndexBuffer, D> ||
+                      std::is_base_of_v<VulkanBufferObject, D>) {
+            auto ptr = handle_cast<D*>(handle);
+            ptr->terminate();
+        }
         destruct(handle, handle_cast<D const*>(handle));
     }
 
-    // This version of destruct takes a VulkanContext and calls a terminate(VulkanContext&)
-    // on the handle before calling the dtor
-    template<typename Dp, typename B>
-    void destructBuffer(Handle<B> handle) noexcept {
-        auto ptr = handle_cast<Dp*>(handle);
-        ptr->terminate();
-        mHandleAllocator.deallocate(handle, ptr);
-    }
-
     inline void setRenderPrimitiveBuffer(Handle<HwRenderPrimitive> rph,
             Handle<HwVertexBuffer> vbh, Handle<HwIndexBuffer> ibh);
 

diff --git a/filament/backend/src/vulkan/VulkanHandles.h b/filament/backend/src/vulkan/VulkanHandles.h
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
- #ifndef TNT_FILAMENT_BACKEND_VULKANHANDLES_H
- #define TNT_FILAMENT_BACKEND_VULKANHANDLES_H
+#ifndef TNT_FILAMENT_BACKEND_VULKANHANDLES_H
+#define TNT_FILAMENT_BACKEND_VULKANHANDLES_H
+
+// This needs to be at the top
+#include "DriverBase.h"
 
-#include "VulkanDriver.h"
 #include "VulkanPipelineCache.h"
 #include "VulkanBuffer.h"
 #include "VulkanSwapChain.h"
@@ -26,7 +28,7 @@
 
 #include "private/backend/SamplerGroup.h"
 
-#include "utils/Mutex.h"
+#include <utils/Mutex.h>
 
 namespace filament::backend {
 

diff --git a/filament/backend/src/vulkan/VulkanSwapChain.h b/filament/backend/src/vulkan/VulkanSwapChain.h
@@ -17,8 +17,9 @@
 #ifndef TNT_FILAMENT_BACKEND_VULKANSWAPCHAIN_H
 #define TNT_FILAMENT_BACKEND_VULKANSWAPCHAIN_H
 
+#include "DriverBase.h"
+
 #include "VulkanContext.h"
-#include "VulkanDriver.h"
 
 #include <backend/platforms/VulkanPlatform.h>
 

diff --git a/filament/backend/src/vulkan/VulkanTexture.h b/filament/backend/src/vulkan/VulkanTexture.h
@@ -17,7 +17,8 @@
  #ifndef TNT_FILAMENT_BACKEND_VULKANTEXTURE_H
  #define TNT_FILAMENT_BACKEND_VULKANTEXTURE_H
 
-#include "VulkanDriver.h"
+#include "DriverBase.h"
+
 #include "VulkanBuffer.h"
 #include "VulkanImageUtility.h"