code refine

K1ngst0m · Oct 28, 2023 · 0ec086d · 0ec086d
1 parent ceef91d
commit 0ec086d
Show file tree

Hide file tree

Showing 18 changed files with 3 additions and 18 deletions.
diff --git a/engine/api/vulkan/buffer.h b/engine/api/vulkan/buffer.h
@@ -1,7 +1,6 @@
 #ifndef VULKAN_BUFFER_H_
 #define VULKAN_BUFFER_H_
 
-#include "api/gpuResource.h"
 #include "vkUtils.h"
 
 namespace aph::vk

diff --git a/engine/api/vulkan/commandBuffer.cpp b/engine/api/vulkan/commandBuffer.cpp
@@ -1,5 +1,4 @@
 #include "commandBuffer.h"
-#include "api/gpuResource.h"
 #include "device.h"
 
 namespace aph::vk

diff --git a/engine/api/vulkan/commandBuffer.h b/engine/api/vulkan/commandBuffer.h
@@ -1,7 +1,6 @@
 #ifndef COMMANDBUFFER_H_
 #define COMMANDBUFFER_H_
 
-#include "api/gpuResource.h"
 #include "vkUtils.h"
 
 namespace aph::vk

diff --git a/engine/api/vulkan/descriptorSet.h b/engine/api/vulkan/descriptorSet.h
@@ -1,7 +1,6 @@
 #ifndef DESCRIPTORSET_H_
 #define DESCRIPTORSET_H_
 
-#include "api/gpuResource.h"
 #include "threads/spinlock.h"
 #include "vkUtils.h"
 

diff --git a/engine/api/vulkan/device.cpp b/engine/api/vulkan/device.cpp
@@ -1,5 +1,4 @@
 #include "device.h"
-#include "api/gpuResource.h"
 
 const VkAllocationCallbacks* gVkAllocator = aph::vk::vkAllocator();
 

diff --git a/engine/api/vulkan/image.h b/engine/api/vulkan/image.h
@@ -1,7 +1,6 @@
 #ifndef VULKAN_IMAGE_H_
 #define VULKAN_IMAGE_H_
 
-#include "api/gpuResource.h"
 #include "vkUtils.h"
 
 namespace aph::vk

diff --git a/engine/api/vulkan/instance.h b/engine/api/vulkan/instance.h
@@ -2,7 +2,6 @@
 #define INSTANCE_H_
 
 #include "threads/threadPool.h"
-#include "api/gpuResource.h"
 #include "vkUtils.h"
 
 namespace aph::vk

diff --git a/engine/api/vulkan/physicalDevice.h b/engine/api/vulkan/physicalDevice.h
@@ -2,7 +2,6 @@
 #define PHYSICALDEVICE_H_
 
 #include "instance.h"
-#include "api/gpuResource.h"
 
 namespace aph::vk
 {

diff --git a/engine/api/vulkan/pipeline.h b/engine/api/vulkan/pipeline.h
@@ -1,7 +1,6 @@
 #ifndef PIPELINE_H_
 #define PIPELINE_H_
 
-#include "api/gpuResource.h"
 #include "vkUtils.h"
 
 namespace aph::vk

diff --git a/engine/api/vulkan/queue.h b/engine/api/vulkan/queue.h
@@ -1,7 +1,6 @@
 #ifndef QUEUE_H_
 #define QUEUE_H_
 
-#include "api/gpuResource.h"
 #include "vkUtils.h"
 
 namespace aph::vk

diff --git a/engine/api/vulkan/sampler.h b/engine/api/vulkan/sampler.h
@@ -1,7 +1,6 @@
 #ifndef APH_SAMPLER_H
 #define APH_SAMPLER_H
 
-#include "api/gpuResource.h"
 #include "vkUtils.h"
 
 namespace aph::vk

diff --git a/engine/api/vulkan/shader.h b/engine/api/vulkan/shader.h
@@ -1,7 +1,6 @@
 #ifndef VULKAN_SHADER_H_
 #define VULKAN_SHADER_H_
 
-#include "api/gpuResource.h"
 #include "vkUtils.h"
 
 namespace aph::vk

diff --git a/engine/api/vulkan/swapChain.h b/engine/api/vulkan/swapChain.h
@@ -2,7 +2,6 @@
 #define VULKAN_SWAPCHAIN_H_
 
 #include "wsi/wsi.h"
-#include "api/gpuResource.h"
 #include "vkUtils.h"
 
 namespace aph::vk

diff --git a/engine/api/vulkan/syncPrimitive.h b/engine/api/vulkan/syncPrimitive.h
@@ -3,7 +3,6 @@
 
 #include "common/objectPool.h"
 #include "threads/spinlock.h"
-#include "api/gpuResource.h"
 #include "vkUtils.h"
 
 namespace aph::vk

diff --git a/engine/api/vulkan/vkInit.h b/engine/api/vulkan/vkInit.h
@@ -1,7 +1,7 @@
 #ifndef VKLINIT_H_
 #define VKLINIT_H_
 
-#include <vulkan/vulkan.h>
+#include <volk.h>
 
 #include <vector>
 

diff --git a/engine/api/vulkan/vkUtils.h b/engine/api/vulkan/vkUtils.h
@@ -1,7 +1,6 @@
 #ifndef VKLUTILS_H_
 #define VKLUTILS_H_
 
-#include "api/gpuResource.h"
 #if defined(__linux__)
     #define VK_USE_PLATFORM_XCB_KHR
 #endif
@@ -12,6 +11,8 @@
 #include "common/logger.h"
 #include "common/objectPool.h"
 
+#include "../gpuResource.h"
+
 // Custom define for better code readability
 #define VK_FLAGS_NONE 0
 // Default fence timeout in nanoseconds

diff --git a/engine/renderer/api/vulkan/renderer.cpp b/engine/renderer/api/vulkan/renderer.cpp
@@ -4,7 +4,6 @@
 #include "scene/mesh.h"
 #include "common/common.h"
 
-#include "api/gpuResource.h"
 #include "common/assetManager.h"
 
 #include "volk.h"

diff --git a/engine/renderer/api/vulkan/sceneRenderer.cpp b/engine/renderer/api/vulkan/sceneRenderer.cpp
@@ -2,7 +2,6 @@
 
 #include "ui/ui.h"
 
-#include "api/gpuResource.h"
 #include "api/vulkan/vkUtils.h"
 #include "common/assetManager.h"