diff --git a/CMSceneGraph b/CMSceneGraph index 0178a443..0f92de76 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 0178a443b3d96f08f95c42b474f526bfd4e29389 +Subproject commit 0f92de76507348b9a5a5cdd80a51406bfae00ddd diff --git a/CMakeLists.txt b/CMakeLists.txt index e89d61ed..78306f00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ SET(ULRE CMCore CMAssetsManage CMSceneGraph ULRE.Util - ULRE.RenderDevice.Vulkan + ULRE.VulkanRender ULRE.SceneGraph MathGeoLib ${JSONCPP_LIBRARY} @@ -55,4 +55,4 @@ add_subdirectory(example) IF(SUPPORT_QT_VULKAN) fix_project_version(1,1) add_project_meta(META_FILES_TO_INCLUDE) -ENDIF(SUPPORT_QT_VULKAN) \ No newline at end of file +ENDIF(SUPPORT_QT_VULKAN) diff --git a/example/Vulkan/Atomsphere.cpp b/example/Vulkan/Atomsphere.cpp index 15fbd818..69b56512 100644 --- a/example/Vulkan/Atomsphere.cpp +++ b/example/Vulkan/Atomsphere.cpp @@ -4,8 +4,8 @@ #include"VulkanAppFramework.h" #include #include -#include -#include +#include +#include #include using namespace hgl; diff --git a/example/Vulkan/DeferredModel.cpp b/example/Vulkan/DeferredModel.cpp index bfc9cedc..18e7e97d 100644 --- a/example/Vulkan/DeferredModel.cpp +++ b/example/Vulkan/DeferredModel.cpp @@ -4,13 +4,13 @@ #include"VulkanAppFramework.h" #include #include -#include -#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace hgl; using namespace hgl::graph; diff --git a/example/Vulkan/DrawText.cpp b/example/Vulkan/DrawText.cpp index 0b26d2e4..68271f01 100644 --- a/example/Vulkan/DrawText.cpp +++ b/example/Vulkan/DrawText.cpp @@ -6,8 +6,8 @@ #include #include"VulkanAppFramework.h" -#include -#include +#include +#include #include using namespace hgl; diff --git a/example/Vulkan/DrawTile.cpp b/example/Vulkan/DrawTile.cpp index 3ef58e43..e6c0832e 100644 --- a/example/Vulkan/DrawTile.cpp +++ b/example/Vulkan/DrawTile.cpp @@ -6,8 +6,8 @@ #include #include"VulkanAppFramework.h" -#include -#include +#include +#include #include using namespace hgl; diff --git a/example/Vulkan/Geometry2D.cpp b/example/Vulkan/Geometry2D.cpp index 842ea215..80620174 100644 --- a/example/Vulkan/Geometry2D.cpp +++ b/example/Vulkan/Geometry2D.cpp @@ -7,8 +7,8 @@ #include"VulkanAppFramework.h" #include #include -#include -#include +#include +#include #include using namespace hgl; diff --git a/example/Vulkan/Geometry3D.cpp b/example/Vulkan/Geometry3D.cpp index b92953ab..6f4b1bb4 100644 --- a/example/Vulkan/Geometry3D.cpp +++ b/example/Vulkan/Geometry3D.cpp @@ -3,7 +3,7 @@ #include"VulkanAppFramework.h" #include #include -#include +#include #include using namespace hgl; diff --git a/example/Vulkan/HQFilterTexture.cpp b/example/Vulkan/HQFilterTexture.cpp index 8e3ef05e..1ba73324 100644 --- a/example/Vulkan/HQFilterTexture.cpp +++ b/example/Vulkan/HQFilterTexture.cpp @@ -2,8 +2,8 @@ // 测试高质量纹理过滤函数 #include"VulkanAppFramework.h" -#include -#include +#include +#include #include using namespace hgl; diff --git a/example/Vulkan/InlineGeometryScene.cpp b/example/Vulkan/InlineGeometryScene.cpp index c7e06b19..38a13a5d 100644 --- a/example/Vulkan/InlineGeometryScene.cpp +++ b/example/Vulkan/InlineGeometryScene.cpp @@ -4,8 +4,8 @@ #include"VulkanAppFramework.h" #include #include -#include -#include +#include +#include #include using namespace hgl; diff --git a/example/Vulkan/OffscreenRender.cpp b/example/Vulkan/OffscreenRender.cpp index e385caf3..29818515 100644 --- a/example/Vulkan/OffscreenRender.cpp +++ b/example/Vulkan/OffscreenRender.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include"VulkanAppFramework.h" diff --git a/example/Vulkan/RectanglePrimitive.cpp b/example/Vulkan/RectanglePrimitive.cpp index 6a6549b3..db40b476 100644 --- a/example/Vulkan/RectanglePrimitive.cpp +++ b/example/Vulkan/RectanglePrimitive.cpp @@ -2,8 +2,8 @@ // 该示例是texture_rect的进化，演示使用GeometryShader画矩形 #include"VulkanAppFramework.h" -#include -#include +#include +#include #include using namespace hgl; diff --git a/example/Vulkan/TextureFormat.cpp b/example/Vulkan/TextureFormat.cpp index 4b5f4d19..35d2dd50 100644 --- a/example/Vulkan/TextureFormat.cpp +++ b/example/Vulkan/TextureFormat.cpp @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include +#include +#include using namespace hgl; using namespace hgl::graph; diff --git a/example/Vulkan/texture_rect.cpp b/example/Vulkan/texture_rect.cpp index 4ab1a476..eb38522c 100644 --- a/example/Vulkan/texture_rect.cpp +++ b/example/Vulkan/texture_rect.cpp @@ -2,9 +2,9 @@ // 该示例是1.indices_rect的进化，演示在矩形上贴上贴图 #include"VulkanAppFramework.h" -#include -#include -#include +#include +#include +#include #include using namespace hgl; diff --git a/example/common/VulkanAppFramework.h b/example/common/VulkanAppFramework.h index bbd30aa3..c7081ecf 100644 --- a/example/common/VulkanAppFramework.h +++ b/example/common/VulkanAppFramework.h @@ -1,23 +1,23 @@ #pragma once #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include using namespace hgl; diff --git a/inc/hgl/graph/InlineGeometry.h b/inc/hgl/graph/InlineGeometry.h index 0c015a22..4b661747 100644 --- a/inc/hgl/graph/InlineGeometry.h +++ b/inc/hgl/graph/InlineGeometry.h @@ -1,7 +1,7 @@ #ifndef HGL_GRAPH_INLINE_GEOMETRY_INCLUDE #define HGL_GRAPH_INLINE_GEOMETRY_INCLUDE -#include +#include #include #include #include diff --git a/inc/hgl/graph/RenderList.h b/inc/hgl/graph/RenderList.h index 2332a368..1bcd673b 100644 --- a/inc/hgl/graph/RenderList.h +++ b/inc/hgl/graph/RenderList.h @@ -1,7 +1,7 @@ #ifndef HGL_GRAPH_RENDER_LIST_INCLUDE #define HGL_GRAPH_RENDER_LIST_INCLUDE -#include +#include #include #include #include diff --git a/inc/hgl/graph/RenderableCreater.h b/inc/hgl/graph/RenderableCreater.h index 7464915a..49cc3570 100644 --- a/inc/hgl/graph/RenderableCreater.h +++ b/inc/hgl/graph/RenderableCreater.h @@ -1,9 +1,9 @@ #ifndef HGL_GRAPH_RENDERABLE_CREATER_INCLUDE #define HGL_GRAPH_RENDERABLE_CREATER_INCLUDE -#include +#include #include -#include +#include namespace hgl { namespace graph diff --git a/inc/hgl/graph/SceneNode.h b/inc/hgl/graph/SceneNode.h index b4c11644..a05b41a8 100644 --- a/inc/hgl/graph/SceneNode.h +++ b/inc/hgl/graph/SceneNode.h @@ -3,7 +3,7 @@ #include #include -#include +#include namespace hgl { namespace graph diff --git a/inc/hgl/graph/SceneOrient.h b/inc/hgl/graph/SceneOrient.h index f961df45..a2547b6c 100644 --- a/inc/hgl/graph/SceneOrient.h +++ b/inc/hgl/graph/SceneOrient.h @@ -3,7 +3,7 @@ //#include #include -#include +#include //#include namespace hgl { diff --git a/inc/hgl/graph/TileData.h b/inc/hgl/graph/TileData.h index f21a66e7..b79be1f1 100644 --- a/inc/hgl/graph/TileData.h +++ b/inc/hgl/graph/TileData.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include VK_NAMESPACE_USING diff --git a/inc/hgl/graph/vulkan/VK.h b/inc/hgl/graph/VK.h similarity index 95% rename from inc/hgl/graph/vulkan/VK.h rename to inc/hgl/graph/VK.h index 524c1058..cacaa6be 100644 --- a/inc/hgl/graph/vulkan/VK.h +++ b/inc/hgl/graph/VK.h @@ -4,10 +4,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include VK_NAMESPACE_BEGIN diff --git a/inc/hgl/graph/vulkan/VKBuffer.h b/inc/hgl/graph/VKBuffer.h similarity index 97% rename from inc/hgl/graph/vulkan/VKBuffer.h rename to inc/hgl/graph/VKBuffer.h index 11d12b6d..4e194677 100644 --- a/inc/hgl/graph/vulkan/VKBuffer.h +++ b/inc/hgl/graph/VKBuffer.h @@ -1,8 +1,8 @@ #ifndef HGL_GRAPH_VULKAN_BUFFER_INCLUDE #define HGL_GRAPH_VULKAN_BUFFER_INCLUDE -#include -#include +#include +#include VK_NAMESPACE_BEGIN struct BufferData { diff --git a/inc/hgl/graph/vulkan/VKBufferData.h b/inc/hgl/graph/VKBufferData.h similarity index 100% rename from inc/hgl/graph/vulkan/VKBufferData.h rename to inc/hgl/graph/VKBufferData.h diff --git a/inc/hgl/graph/vulkan/VKCommandBuffer.h b/inc/hgl/graph/VKCommandBuffer.h similarity index 97% rename from inc/hgl/graph/vulkan/VKCommandBuffer.h rename to inc/hgl/graph/VKCommandBuffer.h index f3a1415f..8279938c 100644 --- a/inc/hgl/graph/vulkan/VKCommandBuffer.h +++ b/inc/hgl/graph/VKCommandBuffer.h @@ -1,9 +1,9 @@ #ifndef HGL_GRAPH_VULKAN_COMMAND_BUFFER_INCLUDE #define HGL_GRAPH_VULKAN_COMMAND_BUFFER_INCLUDE -#include -#include -#include +#include +#include +#include VK_NAMESPACE_BEGIN //push constant 一般只有128/256字节，仅能存在矩阵。 //所以我们将每个对象的独立变换矩阵存在push constant中 diff --git a/inc/hgl/graph/vulkan/VKDatabase.h b/inc/hgl/graph/VKDatabase.h similarity index 95% rename from inc/hgl/graph/vulkan/VKDatabase.h rename to inc/hgl/graph/VKDatabase.h index a53fef42..093a1ca3 100644 --- a/inc/hgl/graph/vulkan/VKDatabase.h +++ b/inc/hgl/graph/VKDatabase.h @@ -1,16 +1,16 @@ #ifndef HGL_GRAPH_VULKAN_DATABASE_INCLUDE #define HGL_GRAPH_VULKAN_DATABASE_INCLUDE -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include #include VK_NAMESPACE_BEGIN diff --git a/inc/hgl/graph/vulkan/VKDebugOut.h b/inc/hgl/graph/VKDebugOut.h similarity index 97% rename from inc/hgl/graph/vulkan/VKDebugOut.h rename to inc/hgl/graph/VKDebugOut.h index 280cac6e..2bc2394c 100644 --- a/inc/hgl/graph/vulkan/VKDebugOut.h +++ b/inc/hgl/graph/VKDebugOut.h @@ -1,7 +1,7 @@ #ifndef HGL_GRAPH_VULKAN_DEBUG_OUT_INCLUDE #define HGL_GRAPH_VULKAN_DEBUG_OUT_INCLUDE -#include +#include VK_NAMESPACE_BEGIN diff --git a/inc/hgl/graph/vulkan/VKDescriptorSets.h b/inc/hgl/graph/VKDescriptorSets.h similarity index 97% rename from inc/hgl/graph/vulkan/VKDescriptorSets.h rename to inc/hgl/graph/VKDescriptorSets.h index e4e0e6a3..fb63b8f2 100644 --- a/inc/hgl/graph/vulkan/VKDescriptorSets.h +++ b/inc/hgl/graph/VKDescriptorSets.h @@ -1,7 +1,7 @@ #ifndef HGL_GRAPH_VULKAN_DESCRIPTOR_SETS_LAYOUT_INCLUDE #define HGL_GRAPH_VULKAN_DESCRIPTOR_SETS_LAYOUT_INCLUDE -#include +#include #include VK_NAMESPACE_BEGIN class Buffer; diff --git a/inc/hgl/graph/vulkan/VKDevice.h b/inc/hgl/graph/VKDevice.h similarity index 98% rename from inc/hgl/graph/vulkan/VKDevice.h rename to inc/hgl/graph/VKDevice.h index 87d1dd5a..04229418 100644 --- a/inc/hgl/graph/vulkan/VKDevice.h +++ b/inc/hgl/graph/VKDevice.h @@ -8,12 +8,12 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include namespace hgl { diff --git a/inc/hgl/graph/vulkan/VKDeviceAttribute.h b/inc/hgl/graph/VKDeviceAttribute.h similarity index 97% rename from inc/hgl/graph/vulkan/VKDeviceAttribute.h rename to inc/hgl/graph/VKDeviceAttribute.h index e323c113..b0a3900d 100644 --- a/inc/hgl/graph/vulkan/VKDeviceAttribute.h +++ b/inc/hgl/graph/VKDeviceAttribute.h @@ -1,6 +1,6 @@ #pragma once -#include +#include VK_NAMESPACE_BEGIN diff --git a/inc/hgl/graph/vulkan/VKFence.h b/inc/hgl/graph/VKFence.h similarity index 92% rename from inc/hgl/graph/vulkan/VKFence.h rename to inc/hgl/graph/VKFence.h index a15165ea..0ad8ab4a 100644 --- a/inc/hgl/graph/vulkan/VKFence.h +++ b/inc/hgl/graph/VKFence.h @@ -1,7 +1,7 @@ #ifndef HGL_VULKAN_GRAPH_FENCE_INCLUDE #define HGL_VULKAN_GRAPH_FENCE_INCLUDE -#include +#include VK_NAMESPACE_BEGIN class Fence { diff --git a/inc/hgl/graph/vulkan/VKFramebuffer.h b/inc/hgl/graph/VKFramebuffer.h similarity index 97% rename from inc/hgl/graph/vulkan/VKFramebuffer.h rename to inc/hgl/graph/VKFramebuffer.h index 5037460d..d34cefbe 100644 --- a/inc/hgl/graph/vulkan/VKFramebuffer.h +++ b/inc/hgl/graph/VKFramebuffer.h @@ -1,7 +1,7 @@ #ifndef HGL_GRAPH_VULKAN_FRAMEBUFFER_INCLUDE #define HGL_GRAPH_VULKAN_FRAMEBUFFER_INCLUDE -#include +#include VK_NAMESPACE_BEGIN class Framebuffer { diff --git a/inc/hgl/graph/vulkan/VKImageView.h b/inc/hgl/graph/VKImageView.h similarity index 98% rename from inc/hgl/graph/vulkan/VKImageView.h rename to inc/hgl/graph/VKImageView.h index bed94cf0..b43304ef 100644 --- a/inc/hgl/graph/vulkan/VKImageView.h +++ b/inc/hgl/graph/VKImageView.h @@ -1,7 +1,7 @@ #ifndef HGL_GRAPH_VULKAN_IMAGE_VIEW_INCLUDE #define HGL_GRAPH_VULKAN_IMAGE_VIEW_INCLUDE -#include +#include VK_NAMESPACE_BEGIN class ImageView { diff --git a/inc/hgl/graph/vulkan/VKInstance.h b/inc/hgl/graph/VKInstance.h similarity index 96% rename from inc/hgl/graph/vulkan/VKInstance.h rename to inc/hgl/graph/VKInstance.h index dcb612a9..6f25a578 100644 --- a/inc/hgl/graph/vulkan/VKInstance.h +++ b/inc/hgl/graph/VKInstance.h @@ -4,8 +4,8 @@ #include #include #include -#include -#include +#include +#include VK_NAMESPACE_BEGIN #define VK_BOOL1BIT(name) bool name:1; diff --git a/inc/hgl/graph/vulkan/VKMaterial.h b/inc/hgl/graph/VKMaterial.h similarity index 95% rename from inc/hgl/graph/vulkan/VKMaterial.h rename to inc/hgl/graph/VKMaterial.h index 6e27c476..096691d5 100644 --- a/inc/hgl/graph/vulkan/VKMaterial.h +++ b/inc/hgl/graph/VKMaterial.h @@ -1,11 +1,11 @@ #ifndef HGL_GRAPH_VULKAN_MATERIAL_INCLUDE #define HGL_GRAPH_VULKAN_MATERIAL_INCLUDE -#include +#include #include #include -#include -#include +#include +#include VK_NAMESPACE_BEGIN class DescriptorSetLayoutCreater; diff --git a/inc/hgl/graph/vulkan/VKMaterialInstance.h b/inc/hgl/graph/VKMaterialInstance.h similarity index 95% rename from inc/hgl/graph/vulkan/VKMaterialInstance.h rename to inc/hgl/graph/VKMaterialInstance.h index 85613c0f..4642eec7 100644 --- a/inc/hgl/graph/vulkan/VKMaterialInstance.h +++ b/inc/hgl/graph/VKMaterialInstance.h @@ -1,7 +1,7 @@ #ifndef HGL_GRAPH_VULKAN_MATERIAL_INSTANCE_INCLUDE #define HGL_GRAPH_VULKAN_MATERIAL_INSTANCE_INCLUDE -#include +#include #include VK_NAMESPACE_BEGIN class MaterialInstance diff --git a/inc/hgl/graph/vulkan/VKMemory.h b/inc/hgl/graph/VKMemory.h similarity index 98% rename from inc/hgl/graph/vulkan/VKMemory.h rename to inc/hgl/graph/VKMemory.h index e291e104..c6e24e3d 100644 --- a/inc/hgl/graph/vulkan/VKMemory.h +++ b/inc/hgl/graph/VKMemory.h @@ -1,7 +1,7 @@ #ifndef HGL_GRAPH_VULKAN_MEMORY_INCLUDE #define HGL_GRAPH_VULKAN_MEMORY_INCLUDE -#include +#include VK_NAMESPACE_BEGIN class Memory { diff --git a/inc/hgl/graph/vulkan/VKPhysicalDevice.h b/inc/hgl/graph/VKPhysicalDevice.h similarity index 99% rename from inc/hgl/graph/vulkan/VKPhysicalDevice.h rename to inc/hgl/graph/VKPhysicalDevice.h index 735212ff..7777d6ad 100644 --- a/inc/hgl/graph/vulkan/VKPhysicalDevice.h +++ b/inc/hgl/graph/VKPhysicalDevice.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/inc/hgl/graph/vulkan/VKPipeline.h b/inc/hgl/graph/VKPipeline.h similarity index 85% rename from inc/hgl/graph/vulkan/VKPipeline.h rename to inc/hgl/graph/VKPipeline.h index 7d44159a..c449805a 100644 --- a/inc/hgl/graph/vulkan/VKPipeline.h +++ b/inc/hgl/graph/VKPipeline.h @@ -1,9 +1,9 @@ #ifndef HGL_GRAPH_VULKAN_PIPELINE_INCLUDE #define HGL_GRAPH_VULKAN_PIPELINE_INCLUDE -#include -#include -#include +#include +#include +#include #include VK_NAMESPACE_BEGIN class Pipeline diff --git a/inc/hgl/graph/vulkan/VKRenderPass.h b/inc/hgl/graph/VKRenderPass.h similarity index 97% rename from inc/hgl/graph/vulkan/VKRenderPass.h rename to inc/hgl/graph/VKRenderPass.h index b5d27a61..7b2ded1b 100644 --- a/inc/hgl/graph/vulkan/VKRenderPass.h +++ b/inc/hgl/graph/VKRenderPass.h @@ -1,7 +1,7 @@ #ifndef HGL_GRAPH_VULKAN_RENDER_PASS_INCLUDE #define HGL_GRAPH_VULKAN_RENDER_PASS_INCLUDE -#include +#include VK_NAMESPACE_BEGIN /** * RenderPass功能封装
diff --git a/inc/hgl/graph/vulkan/VKRenderTarget.h b/inc/hgl/graph/VKRenderTarget.h similarity index 94% rename from inc/hgl/graph/vulkan/VKRenderTarget.h rename to inc/hgl/graph/VKRenderTarget.h index 3c92ecc2..4c16758b 100644 --- a/inc/hgl/graph/vulkan/VKRenderTarget.h +++ b/inc/hgl/graph/VKRenderTarget.h @@ -1,11 +1,11 @@ #ifndef HGL_GRAPH_VULKAN_RENDER_TARGET_INCLUDE #define HGL_GRAPH_VULKAN_RENDER_TARGET_INCLUDE -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include VK_NAMESPACE_BEGIN /** * 渲染目标 diff --git a/inc/hgl/graph/vulkan/VKRenderable.h b/inc/hgl/graph/VKRenderable.h similarity index 97% rename from inc/hgl/graph/vulkan/VKRenderable.h rename to inc/hgl/graph/VKRenderable.h index dfbff3ab..a056de38 100644 --- a/inc/hgl/graph/vulkan/VKRenderable.h +++ b/inc/hgl/graph/VKRenderable.h @@ -1,8 +1,8 @@ #ifndef HGL_GRAPH_VULKAN_RENDERABLE_INCLUDE #define HGL_GRAPH_VULKAN_RENDERABLE_INCLUDE -#include -#include +#include +#include #include #include #include diff --git a/inc/hgl/graph/vulkan/VKRenderableInstance.h b/inc/hgl/graph/VKRenderableInstance.h similarity index 94% rename from inc/hgl/graph/vulkan/VKRenderableInstance.h rename to inc/hgl/graph/VKRenderableInstance.h index fd117ab1..79e8256c 100644 --- a/inc/hgl/graph/vulkan/VKRenderableInstance.h +++ b/inc/hgl/graph/VKRenderableInstance.h @@ -1,10 +1,10 @@ #ifndef HGL_GRAPH_RENDERABLE_INSTANCE_INCLUDE #define HGL_GRAPH_RENDERABLE_INSTANCE_INCLUDE -#include -#include -#include -#include +#include +#include +#include +#include VK_NAMESPACE_BEGIN /** * 可渲染对象节点 diff --git a/inc/hgl/graph/vulkan/VKSampler.h b/inc/hgl/graph/VKSampler.h similarity index 94% rename from inc/hgl/graph/vulkan/VKSampler.h rename to inc/hgl/graph/VKSampler.h index d29dfb06..1665f531 100644 --- a/inc/hgl/graph/vulkan/VKSampler.h +++ b/inc/hgl/graph/VKSampler.h @@ -1,7 +1,7 @@ #ifndef HGL_GRAPH_VULKAN_SAMPLER_INCLUDE #define HGL_GRAPH_VULKAN_SAMPLER_INCLUDE -#include +#include VK_NAMESPACE_BEGIN class Device; diff --git a/inc/hgl/graph/vulkan/VKSemaphore.h b/inc/hgl/graph/VKSemaphore.h similarity index 94% rename from inc/hgl/graph/vulkan/VKSemaphore.h rename to inc/hgl/graph/VKSemaphore.h index b82fd7a8..07cb4a2b 100644 --- a/inc/hgl/graph/vulkan/VKSemaphore.h +++ b/inc/hgl/graph/VKSemaphore.h @@ -1,7 +1,7 @@ #ifndef HGL_GRAPH_VULKAN_SEMAPHORE_INCLUDE #define HGL_GRAPH_VULKAN_SEMAPHORE_INCLUDE -#include +#include VK_NAMESPACE_BEGIN class GPUSemaphore { diff --git a/inc/hgl/graph/vulkan/VKShaderModule.h b/inc/hgl/graph/VKShaderModule.h similarity index 100% rename from inc/hgl/graph/vulkan/VKShaderModule.h rename to inc/hgl/graph/VKShaderModule.h diff --git a/inc/hgl/graph/vulkan/VKShaderModuleMap.h b/inc/hgl/graph/VKShaderModuleMap.h similarity index 86% rename from inc/hgl/graph/vulkan/VKShaderModuleMap.h rename to inc/hgl/graph/VKShaderModuleMap.h index 8de04b86..fee67547 100644 --- a/inc/hgl/graph/vulkan/VKShaderModuleMap.h +++ b/inc/hgl/graph/VKShaderModuleMap.h @@ -2,8 +2,8 @@ #define HGL_GRAPH_VULKAN_SHADER_MODULE_MAP_INCLUDE #include -#include -#include +#include +#include VK_NAMESPACE_BEGIN diff --git a/inc/hgl/graph/vulkan/VKSubmitQueue.h b/inc/hgl/graph/VKSubmitQueue.h similarity index 92% rename from inc/hgl/graph/vulkan/VKSubmitQueue.h rename to inc/hgl/graph/VKSubmitQueue.h index e26b4915..be517ac1 100644 --- a/inc/hgl/graph/vulkan/VKSubmitQueue.h +++ b/inc/hgl/graph/VKSubmitQueue.h @@ -1,8 +1,8 @@ #ifndef HGL_GRAPH_VULKAN_SUBMIT_QUEUE_INCLUDE #define HGL_GRAPH_VULKAN_SUBMIT_QUEUE_INCLUDE -#include -#include +#include +#include VK_NAMESPACE_BEGIN class SubmitQueue { diff --git a/inc/hgl/graph/vulkan/VKSubpass.h b/inc/hgl/graph/VKSubpass.h similarity index 100% rename from inc/hgl/graph/vulkan/VKSubpass.h rename to inc/hgl/graph/VKSubpass.h diff --git a/inc/hgl/graph/vulkan/VKSurfaceExtensionName.h b/inc/hgl/graph/VKSurfaceExtensionName.h similarity index 96% rename from inc/hgl/graph/vulkan/VKSurfaceExtensionName.h rename to inc/hgl/graph/VKSurfaceExtensionName.h index 5b9c1451..57ee55f1 100644 --- a/inc/hgl/graph/vulkan/VKSurfaceExtensionName.h +++ b/inc/hgl/graph/VKSurfaceExtensionName.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #ifdef __ANDROID__ #include diff --git a/inc/hgl/graph/vulkan/VKSwapchain.h b/inc/hgl/graph/VKSwapchain.h similarity index 94% rename from inc/hgl/graph/vulkan/VKSwapchain.h rename to inc/hgl/graph/VKSwapchain.h index 6c0b2afe..1dc5a33a 100644 --- a/inc/hgl/graph/vulkan/VKSwapchain.h +++ b/inc/hgl/graph/VKSwapchain.h @@ -1,8 +1,8 @@ #ifndef HGL_GRAPH_VULKAN_SWAP_CHAIN_INCLUDE #define HGL_GRAPH_VULKAN_SWAP_CHAIN_INCLUDE -#include -#include +#include +#include #include VK_NAMESPACE_BEGIN struct Swapchain diff --git a/inc/hgl/graph/vulkan/VKTexture.h b/inc/hgl/graph/VKTexture.h similarity index 97% rename from inc/hgl/graph/vulkan/VKTexture.h rename to inc/hgl/graph/VKTexture.h index 9eda055d..a5a03781 100644 --- a/inc/hgl/graph/vulkan/VKTexture.h +++ b/inc/hgl/graph/VKTexture.h @@ -1,9 +1,9 @@ #ifndef HGL_GRAPH_VULKAN_TEXTURE_INCLUDE #define HGL_GRAPH_VULKAN_TEXTURE_INCLUDE -#include -#include -#include +#include +#include +#include #include #include VK_NAMESPACE_BEGIN diff --git a/inc/hgl/graph/vulkan/VKVertexAttributeBinding.h b/inc/hgl/graph/VKVertexAttributeBinding.h similarity index 97% rename from inc/hgl/graph/vulkan/VKVertexAttributeBinding.h rename to inc/hgl/graph/VKVertexAttributeBinding.h index 5c494d50..8dcda51c 100644 --- a/inc/hgl/graph/vulkan/VKVertexAttributeBinding.h +++ b/inc/hgl/graph/VKVertexAttributeBinding.h @@ -1,7 +1,7 @@ #ifndef HGL_GRAPH_VULKAN_VERTEX_ATTRIBUTE_BINDING_INCLUDE #define HGL_GRAPH_VULKAN_VERTEX_ATTRIBUTE_BINDING_INCLUDE -#include +#include #include VK_NAMESPACE_BEGIN /** diff --git a/inc/hgl/graph/VertexAttribData.h b/inc/hgl/graph/VertexAttribData.h index 46f913c8..81995e49 100644 --- a/inc/hgl/graph/VertexAttribData.h +++ b/inc/hgl/graph/VertexAttribData.h @@ -1,7 +1,7 @@ #ifndef HGL_GRAPH_VERTEX_ATTRIB_DATA_INCLUDE #define HGL_GRAPH_VERTEX_ATTRIB_DATA_INCLUDE -#include +#include namespace hgl { namespace graph diff --git a/inc/hgl/graph/font/TextRenderable.h b/inc/hgl/graph/font/TextRenderable.h index 79ad2af0..0fd00461 100644 --- a/inc/hgl/graph/font/TextRenderable.h +++ b/inc/hgl/graph/font/TextRenderable.h @@ -1,7 +1,7 @@ #ifndef HGL_GRAPH_TEXT_RENDERABLE_INCLUDE #define HGL_GRAPH_TEXT_RENDERABLE_INCLUDE -#include +#include namespace hgl { namespace graph diff --git a/inc/hgl/graph/shader/ShaderResource.h b/inc/hgl/graph/shader/ShaderResource.h index e3f28ca3..61f2b841 100644 --- a/inc/hgl/graph/shader/ShaderResource.h +++ b/inc/hgl/graph/shader/ShaderResource.h @@ -2,8 +2,8 @@ #include #include #include -#include -#include +#include +#include VK_NAMESPACE_BEGIN struct ShaderStage diff --git a/inc/hgl/gui/Form.h b/inc/hgl/gui/Form.h index 2b3a0461..48461ea6 100644 --- a/inc/hgl/gui/Form.h +++ b/inc/hgl/gui/Form.h @@ -1,7 +1,8 @@ #ifndef HGL_GUI_FORM_INCLUDE #define HGL_GUI_FORM_INCLUDE -#include +#include +#include namespace hgl { namespace gui @@ -11,18 +12,14 @@ namespace hgl /** * 窗体组件，窗体是承载所有GUI控件的基本装置 */ - class Form + class Form:public Widget { protected: //每个窗体独立一个FBO存在，所以每个窗体会有自己的RenderTarget与pipeline - struct - { - vulkan::Pipeline *solid; - vulkan::Pipeline *mask; - vulkan::Pipeline *alpha; - }pipeline; - public: + + Form(ThemeEngine *te=nullptr):Widget(nullptr,te){} + virtual ~Form()=default; };//class Form }//namespace gui }//namespace hgl diff --git a/inc/hgl/gui/ThemeEngine.h b/inc/hgl/gui/ThemeEngine.h index 0b8f460a..3dd41850 100644 --- a/inc/hgl/gui/ThemeEngine.h +++ b/inc/hgl/gui/ThemeEngine.h @@ -2,23 +2,37 @@ #define HGL_GUI_THEME_ENGINE_INCLUDE #include +#include +#include namespace hgl { namespace gui { - class Widget; + namespace vulkan + { + class Device; + }//namespace vulkan class ThemeEngine - { + { + protected: + + vulkan::Device *device; + + MapObject
form_list; + public: + ThemeEngine(vulkan::Device *dev){device=dev;} + virtual ~ThemeEngine()=default; + virtual bool Init()=0; virtual void Clear()=0; - - virtual void DrawFrame(const Widget *)=0; - //virtual void DrawButton(const Widget *)=0; - //virtual void DrawCheckBox(const Widget *)=0; - //virtual void DrawRadioBox(const Widget *)=0; + + virtual bool Registry(Form *)=0; + virtual void Unregistry(Form *)=0; + virtual void Render(Form *)=0; + virtual bool Resize(Form *,const uint32_t,const uint32_t); };//class ThemeEngine // ThemeEngine *CreateThemeEngine(); diff --git a/inc/hgl/gui/Widget.h b/inc/hgl/gui/Widget.h index e434aff3..443d6014 100644 --- a/inc/hgl/gui/Widget.h +++ b/inc/hgl/gui/Widget.h @@ -54,18 +54,8 @@ namespace hgl public: - Widget(Widget *parent=nullptr,ThemeEngine *te=nullptr) - { - parent_widget=parent; - theme_engine=te; - - //默认值 - visible=false; //不显示 - recv_event=false; //不接收事件 - align_bits=0; //不对齐 - position.Clear(); - } - virtual ~Widget(); + Widget(Widget *parent=nullptr,ThemeEngine *te=nullptr); + virtual ~Widget()=default; virtual void Draw(){} };//class Widget diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt index a9396c23..195219e2 100644 --- a/src/GUI/CMakeLists.txt +++ b/src/GUI/CMakeLists.txt @@ -2,7 +2,8 @@ SET(THEME_SOURCE ${GUI_INCLUDE_PATH}/ThemeForm.h ${GUI_INCLUDE_PATH}/ThemeEngine.h - ThemeEngine.cpp) + ThemeEngine.cpp + ThemeForm.cpp) SET(DEFAULT_THEME_SOURCE DefaultThemeEngine.h DefaultThemeEngine.cpp diff --git a/src/GUI/DefaultThemeEngine.cpp b/src/GUI/DefaultThemeEngine.cpp index 00a90e56..fff81add 100644 --- a/src/GUI/DefaultThemeEngine.cpp +++ b/src/GUI/DefaultThemeEngine.cpp @@ -4,21 +4,40 @@ namespace hgl { namespace gui { - ThemeEngine *CreateDefaultThemeEngine() + ThemeEngine *CreateDefaultThemeEngine(vulkan::Device *dev) { - return(new DefaultThemeEngine); + return(new default_theme::DefaultThemeEngine(dev)); } - bool DefaultThemeEngine::Init() + namespace default_theme { - } + bool DefaultThemeEngine::Init() + { + return(true); + } - void DefaultThemeEngine::Clear() - { - } + void DefaultThemeEngine::Clear() + { + } - void DefaultThemeEngine::DrawFrame(const Widget *w) - { - } + bool DefaultThemeEngine::Registry(Form *f) + { + if(!f)return(false); + if(form_list.KeyExist(f))return(false); + + + return(true); + } + + void DefaultThemeEngine::Unregistry(Form *f) + { + if(!f)return; + if(!form_list.KeyExist(f))return; + } + + void DefaultThemeEngine::Render(Form *f) + { + } + }//namespace default_theme }//namespace gui }//namespace hgl \ No newline at end of file diff --git a/src/GUI/DefaultThemeEngine.h b/src/GUI/DefaultThemeEngine.h index d75e8e15..d386b594 100644 --- a/src/GUI/DefaultThemeEngine.h +++ b/src/GUI/DefaultThemeEngine.h @@ -1,8 +1,9 @@ #pragma once #include -#include +#include #include +#include"DTForm.h" namespace hgl { @@ -12,33 +13,33 @@ namespace hgl class Form; ///<窗体 - /** - * 缺省GUI主题引擎 - */ - class DefaultThemeEngine:public ThemeEngine + namespace default_theme { - struct IForm + /** + * 缺省GUI主题引擎 + */ + class DefaultThemeEngine:public ThemeEngine { - Form *form; ///<窗体控件 - vulkan::RenderTarget *rt; ///<渲染目标 - };// - MapObject form_list; + //struct + //{ + // vulkan::Material * m; + // vulkan::MaterialInstance * mi; + //}panel; - struct - { - vulkan::Material * m; - vulkan::MaterialInstance * mi; - }panel; + public: - public: + DefaultThemeEngine(vulkan::Device *dev):ThemeEngine(dev){} + virtual ~DefaultThemeEngine() override; - bool Init() override; - void Clear() override; + bool Init() override; + void Clear() override; - bool Registry(Form *); - void Unregistry(Form *); - void Render(Form *); - };//class DefaultThemeEngine:public ThemeEngine + bool Registry(Form *) override; + void Unregistry(Form *) override; + void Render(Form *) override; + bool Resize(Form *,const uint32_t,const uint32_t) override; + };//class DefaultThemeEngine:public ThemeEngine + }//namespace default_theme }//namespace gui }//namespace hgl \ No newline at end of file diff --git a/src/GUI/Panel.cpp b/src/GUI/Panel.cpp index cb8aa675..f8c7f9fc 100644 --- a/src/GUI/Panel.cpp +++ b/src/GUI/Panel.cpp @@ -1,5 +1,5 @@ #include -#include +#include namespace hgl { diff --git a/src/GUI/ThemeEngine.cpp b/src/GUI/ThemeEngine.cpp index d1eac4c3..9e379572 100644 --- a/src/GUI/ThemeEngine.cpp +++ b/src/GUI/ThemeEngine.cpp @@ -1,4 +1,5 @@ #include +#include namespace hgl { @@ -9,19 +10,35 @@ namespace hgl ThemeEngine *default_theme_engine=nullptr; }//namespace - ThemeEngine *CreateDefaultThemeEngine(); + ThemeEngine *CreateDefaultThemeEngine(vulkan::Device *dev); - ThemeEngine *GetDefaultThemeEngine() + ThemeEngine *GetDefaultThemeEngine(vulkan::Device *dev) { if(!default_theme_engine) - default_theme_engine=CreateDefaultThemeEngine(); + default_theme_engine=CreateDefaultThemeEngine(dev); return default_theme_engine; } - ThemeEngine *CreateThemeEngine() + ThemeEngine *CreateThemeEngine(vulkan::Device *dev) { return GetDefaultThemeEngine(); } + + bool ThemeEngine::Resize(Form *f,const uint32_t w,const uint32_t h) + { + if(!f)return(false); + + ThemeForm *tf; + + if(!form_list.Get(f,tf))return(false); + + if(w<=0||h<=0) + { + tf->SetRenderTarget(nullptr); + return(true); + } + + } }//namespace gui }//namespace hgl \ No newline at end of file diff --git a/src/GUI/Widget.cpp b/src/GUI/Widget.cpp index 5bce9ec0..b8186039 100644 --- a/src/GUI/Widget.cpp +++ b/src/GUI/Widget.cpp @@ -5,7 +5,7 @@ namespace hgl { namespace gui { - Widget::Widget(Widget *parent=nullptr,ThemeEngine *te=nullptr) + Widget::Widget(Widget *parent,ThemeEngine *te) { parent_widget=parent; diff --git a/src/RenderDevice/CMakeLists.txt b/src/RenderDevice/CMakeLists.txt index 96f5da34..3a469853 100644 --- a/src/RenderDevice/CMakeLists.txt +++ b/src/RenderDevice/CMakeLists.txt @@ -1 +1,123 @@ -add_subdirectory(Vulkan) +set(VK_INCLUDE_PATH ${ROOT_INCLUDE_PATH}/hgl/graph) + +SET(VK_DB_SOURCE ${VK_INCLUDE_PATH}/VKDatabase.h + VKDatabase.cpp + VKDatabaseMaterial.cpp) + +SOURCE_GROUP("Database" FILES ${VK_DB_SOURCE}) + +SET(VK_INST_SOURCE ${VK_INCLUDE_PATH}/VKInstance.h + VKInstance.cpp) + +SET(VK_DEBUG_SOURCE ${VK_INCLUDE_PATH}/VKDebugOut.h + VKDebugOut.cpp) + +SET(VK_MEMORY_SOURCE ${VK_INCLUDE_PATH}/VKMemory.h + ${VK_INCLUDE_PATH}/VKBuffer.h + VKMemory.cpp + VKBuffer.cpp) + +SET(VK_DEVICE_SOURCE ${VK_INCLUDE_PATH}/VKDevice.h + ${VK_INCLUDE_PATH}/VKDeviceAttribute.h + VKDeviceAttribute.cpp + VKDeviceCreater.cpp + VKDevice.cpp + VKDeviceBuffer.cpp + VKDeviceImage.cpp + VKDeviceTexture.cpp + VKDeviceFramebuffer.cpp + VKDeviceSwapchain.cpp + VKDeviceRenderPass.cpp + VKDeviceRenderTarget.cpp) + +SET(VK_PHYSICAL_DEVICE_SOURCE ${VK_INCLUDE_PATH}/VKPhysicalDevice.h + VKPhysicalDevice.cpp + VKProperties.cpp) + +SOURCE_GROUP("Device" FILES ${VK_DEVICE_SOURCE}) +SOURCE_GROUP("Device\\Debug" FILES ${VK_DEBUG_SOURCE}) +SOURCE_GROUP("Device\\Instance" FILES ${VK_INST_SOURCE}) +SOURCE_GROUP("Device\\Physical Device" FILES ${VK_PHYSICAL_DEVICE_SOURCE}) +SOURCE_GROUP("Device\\Memory" FILES ${VK_MEMORY_SOURCE}) + +SET(VK_DESCRIPTOR_SETS_SOURCE ${VK_INCLUDE_PATH}/VKDescriptorSets.h + VKDescriptorSets.cpp + VKDescriptorSetLayoutCreater.cpp + VKDescriptorSetLayoutCreater.h) + +SOURCE_GROUP("Descriptor Sets" FILES ${VK_DESCRIPTOR_SETS_SOURCE}) + +SET(VK_SHADER_SOURCE ${VK_INCLUDE_PATH}/VKShaderModule.h + ${VK_INCLUDE_PATH}/VKShaderModuleMap.h + VKShaderModuleMap.cpp + VKShaderModule.cpp) + +SET(VK_TEXTURE_SOURCE ${VK_INCLUDE_PATH}/VKImageView.h + ${VK_INCLUDE_PATH}/VKTexture.h + ${VK_INCLUDE_PATH}/VKSampler.h + VKSampler.cpp + VKImageView.cpp + VKTexture.cpp + VKTextureLoader.cpp) + +SET(VK_MATERIAL_SOURCE ${VK_INCLUDE_PATH}/VKMaterial.h + ${VK_INCLUDE_PATH}/VKMaterialInstance.h + VKMaterial.cpp + VKMaterialInstance.cpp) + +SOURCE_GROUP("Material" FILES ${VK_MATERIAL_SOURCE}) +SOURCE_GROUP("Material\\Texture" FILES ${VK_TEXTURE_SOURCE}) +SOURCE_GROUP("Material\\Shader" FILES ${VK_SHADER_SOURCE}) + +SET(VK_RENDER_PASS_SOURCE ${VK_INCLUDE_PATH}/VKFramebuffer.h + ${VK_INCLUDE_PATH}/VKPipeline.h + ${VK_INCLUDE_PATH}/VKRenderPass.h + ${VK_INCLUDE_PATH}/VKRenderTarget.h + ${VK_INCLUDE_PATH}/VKSwapchain.h + ${VK_INCLUDE_PATH}/VKCommandBuffer.h + ${VK_INCLUDE_PATH}/VKSemaphore.h + ${VK_INCLUDE_PATH}/VKFence.h + VKSubmitQueue.cpp + VKSemaphore.cpp + VKFence.cpp + VKFramebuffer.cpp + VKPipeline.cpp + VKRenderPass.cpp + VKRenderTarget.cpp + VKSwapchain.cpp + VKCommandBuffer.cpp) + +SOURCE_GROUP("Render Pass" FILES ${VK_RENDER_PASS_SOURCE}) + +SET(VK_RENDERABLE_SOURCE ${VK_INCLUDE_PATH}/VKVertexAttributeBinding.h + ${VK_INCLUDE_PATH}/VKRenderable.h + ${VK_INCLUDE_PATH}/VKRenderableInstance.h + VKVertexAttributeBinding.cpp + VKRenderable.cpp + VKRenderableInstance.cpp + VKTileData.cpp + VKTileFont.cpp) + +SOURCE_GROUP("Renderable" FILES ${VK_RENDERABLE_SOURCE}) + +IF(WIN32) + OPTION(FORCE_DISCETE_GPU "Force Discrete GPU" OFF) + + IF(FORCE_DISCETE_GPU) + SET(RENDER_DEVICE_SOURCE ForceDiscreteGPU.c) + ENDIF() +ENDIF(WIN32) + +add_cm_library(ULRE.VulkanRender "ULRE" ${VK_DB_SOURCE} + ${VK_INST_SOURCE} + ${VK_DEBUG_SOURCE} + ${VK_MEMORY_SOURCE} + ${VK_DEVICE_SOURCE} + ${VK_PHYSICAL_DEVICE_SOURCE} + ${VK_DESCRIPTOR_SETS_SOURCE} + ${VK_SHADER_SOURCE} + ${VK_TEXTURE_SOURCE} + ${VK_MATERIAL_SOURCE} + ${VK_RENDER_PASS_SOURCE} + ${VK_RENDERABLE_SOURCE} + ${VK_RENDER_DEVICE_SOURCE}) diff --git a/src/RenderDevice/Vulkan/ForceDiscreteGPU.c b/src/RenderDevice/ForceDiscreteGPU.c similarity index 100% rename from src/RenderDevice/Vulkan/ForceDiscreteGPU.c rename to src/RenderDevice/ForceDiscreteGPU.c diff --git a/src/RenderDevice/Vulkan/VKBuffer.cpp b/src/RenderDevice/VKBuffer.cpp similarity index 77% rename from src/RenderDevice/Vulkan/VKBuffer.cpp rename to src/RenderDevice/VKBuffer.cpp index f1e1aa3d..c0968813 100644 --- a/src/RenderDevice/Vulkan/VKBuffer.cpp +++ b/src/RenderDevice/VKBuffer.cpp @@ -1,4 +1,4 @@ -#include +#include VK_NAMESPACE_BEGIN Buffer::~Buffer() diff --git a/src/RenderDevice/Vulkan/VKCommandBuffer.cpp b/src/RenderDevice/VKCommandBuffer.cpp similarity index 86% rename from src/RenderDevice/Vulkan/VKCommandBuffer.cpp rename to src/RenderDevice/VKCommandBuffer.cpp index 54912970..17ec0d11 100644 --- a/src/RenderDevice/Vulkan/VKCommandBuffer.cpp +++ b/src/RenderDevice/VKCommandBuffer.cpp @@ -1,13 +1,13 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include VK_NAMESPACE_BEGIN CommandBuffer::CommandBuffer(VkDevice dev,const VkExtent2D &extent,const uint32_t atta_count,VkCommandPool cp,VkCommandBuffer cb) diff --git a/src/RenderDevice/Vulkan/VKDatabase.cpp b/src/RenderDevice/VKDatabase.cpp similarity index 96% rename from src/RenderDevice/Vulkan/VKDatabase.cpp rename to src/RenderDevice/VKDatabase.cpp index 7d6799a2..90386f20 100644 --- a/src/RenderDevice/Vulkan/VKDatabase.cpp +++ b/src/RenderDevice/VKDatabase.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include VK_NAMESPACE_BEGIN VAB *Database::CreateVAB(VkFormat format,uint32_t count,const void *data,SharingMode sharing_mode) diff --git a/src/RenderDevice/Vulkan/VKDatabaseMaterial.cpp b/src/RenderDevice/VKDatabaseMaterial.cpp similarity index 94% rename from src/RenderDevice/Vulkan/VKDatabaseMaterial.cpp rename to src/RenderDevice/VKDatabaseMaterial.cpp index 38ba76cf..a6a87610 100644 --- a/src/RenderDevice/Vulkan/VKDatabaseMaterial.cpp +++ b/src/RenderDevice/VKDatabaseMaterial.cpp @@ -1,10 +1,10 @@ -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include +#include VK_NAMESPACE_BEGIN diff --git a/src/RenderDevice/Vulkan/VKDebugOut.cpp b/src/RenderDevice/VKDebugOut.cpp similarity index 99% rename from src/RenderDevice/Vulkan/VKDebugOut.cpp rename to src/RenderDevice/VKDebugOut.cpp index f7e3a358..f7627ff1 100644 --- a/src/RenderDevice/Vulkan/VKDebugOut.cpp +++ b/src/RenderDevice/VKDebugOut.cpp @@ -1,4 +1,4 @@ -#include +#include #include VK_NAMESPACE_BEGIN diff --git a/src/RenderDevice/Vulkan/VKDescriptorSetLayoutCreater.cpp b/src/RenderDevice/VKDescriptorSetLayoutCreater.cpp similarity index 97% rename from src/RenderDevice/Vulkan/VKDescriptorSetLayoutCreater.cpp rename to src/RenderDevice/VKDescriptorSetLayoutCreater.cpp index f9f4ed12..0c71d36e 100644 --- a/src/RenderDevice/Vulkan/VKDescriptorSetLayoutCreater.cpp +++ b/src/RenderDevice/VKDescriptorSetLayoutCreater.cpp @@ -1,6 +1,6 @@ #include"VKDescriptorSetLayoutCreater.h" -#include -#include +#include +#include VK_NAMESPACE_BEGIN DescriptorSetLayoutCreater *Device::CreateDescriptorSetLayoutCreater() diff --git a/src/RenderDevice/Vulkan/VKDescriptorSetLayoutCreater.h b/src/RenderDevice/VKDescriptorSetLayoutCreater.h similarity index 100% rename from src/RenderDevice/Vulkan/VKDescriptorSetLayoutCreater.h rename to src/RenderDevice/VKDescriptorSetLayoutCreater.h diff --git a/src/RenderDevice/Vulkan/VKDescriptorSets.cpp b/src/RenderDevice/VKDescriptorSets.cpp similarity index 91% rename from src/RenderDevice/Vulkan/VKDescriptorSets.cpp rename to src/RenderDevice/VKDescriptorSets.cpp index e0d16f32..0e94a87e 100644 --- a/src/RenderDevice/Vulkan/VKDescriptorSets.cpp +++ b/src/RenderDevice/VKDescriptorSets.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include VK_NAMESPACE_BEGIN void DescriptorSets::Clear() diff --git a/src/RenderDevice/Vulkan/VKDevice.cpp b/src/RenderDevice/VKDevice.cpp similarity index 83% rename from src/RenderDevice/Vulkan/VKDevice.cpp rename to src/RenderDevice/VKDevice.cpp index 3a92222f..3fed6bd2 100644 --- a/src/RenderDevice/Vulkan/VKDevice.cpp +++ b/src/RenderDevice/VKDevice.cpp @@ -1,14 +1,14 @@ -#include +#include #include -#include -#include -#include -#include -#include -//#include -#include -#include -#include +#include +#include +#include +#include +#include +//#include +#include +#include +#include VK_NAMESPACE_BEGIN Device::Device(DeviceAttribute *da) diff --git a/src/RenderDevice/Vulkan/VKDeviceAttribute.cpp b/src/RenderDevice/VKDeviceAttribute.cpp similarity index 96% rename from src/RenderDevice/Vulkan/VKDeviceAttribute.cpp rename to src/RenderDevice/VKDeviceAttribute.cpp index 1a69446a..4470c897 100644 --- a/src/RenderDevice/Vulkan/VKDeviceAttribute.cpp +++ b/src/RenderDevice/VKDeviceAttribute.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include #include VK_NAMESPACE_BEGIN diff --git a/src/RenderDevice/Vulkan/VKDeviceBuffer.cpp b/src/RenderDevice/VKDeviceBuffer.cpp similarity index 96% rename from src/RenderDevice/Vulkan/VKDeviceBuffer.cpp rename to src/RenderDevice/VKDeviceBuffer.cpp index 5f84e67b..5394391f 100644 --- a/src/RenderDevice/Vulkan/VKDeviceBuffer.cpp +++ b/src/RenderDevice/VKDeviceBuffer.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include VK_NAMESPACE_BEGIN bool Device::CreateBuffer(BufferData *buf,VkBufferUsageFlags buf_usage,VkDeviceSize size,const void *data,SharingMode sharing_mode) diff --git a/src/RenderDevice/Vulkan/VKDeviceCreater.cpp b/src/RenderDevice/VKDeviceCreater.cpp similarity index 98% rename from src/RenderDevice/Vulkan/VKDeviceCreater.cpp rename to src/RenderDevice/VKDeviceCreater.cpp index 9d822530..e2bfd833 100644 --- a/src/RenderDevice/Vulkan/VKDeviceCreater.cpp +++ b/src/RenderDevice/VKDeviceCreater.cpp @@ -1,11 +1,11 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/RenderDevice/Vulkan/VKDeviceFramebuffer.cpp b/src/RenderDevice/VKDeviceFramebuffer.cpp similarity index 98% rename from src/RenderDevice/Vulkan/VKDeviceFramebuffer.cpp rename to src/RenderDevice/VKDeviceFramebuffer.cpp index 2a7b6120..18c94331 100644 --- a/src/RenderDevice/Vulkan/VKDeviceFramebuffer.cpp +++ b/src/RenderDevice/VKDeviceFramebuffer.cpp @@ -1,4 +1,4 @@ -#include +#include VK_NAMESPACE_BEGIN VkFramebuffer CreateVulkanFramebuffer(VkDevice device,RenderPass *rp,const VkExtent2D &extent,VkImageView *attachments,const uint attachmentCount) diff --git a/src/RenderDevice/Vulkan/VKDeviceImage.cpp b/src/RenderDevice/VKDeviceImage.cpp similarity index 91% rename from src/RenderDevice/Vulkan/VKDeviceImage.cpp rename to src/RenderDevice/VKDeviceImage.cpp index 4421631b..718f67d5 100644 --- a/src/RenderDevice/Vulkan/VKDeviceImage.cpp +++ b/src/RenderDevice/VKDeviceImage.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include VK_NAMESPACE_BEGIN VkImage Device::CreateImage(VkImageCreateInfo *ici) diff --git a/src/RenderDevice/Vulkan/VKDeviceRenderPass.cpp b/src/RenderDevice/VKDeviceRenderPass.cpp similarity index 98% rename from src/RenderDevice/Vulkan/VKDeviceRenderPass.cpp rename to src/RenderDevice/VKDeviceRenderPass.cpp index 814bb5d9..8ed4a6cc 100644 --- a/src/RenderDevice/Vulkan/VKDeviceRenderPass.cpp +++ b/src/RenderDevice/VKDeviceRenderPass.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include VK_NAMESPACE_BEGIN //void CreateSubpassDependency(VkSubpassDependency *dependency) diff --git a/src/RenderDevice/Vulkan/VKDeviceRenderTarget.cpp b/src/RenderDevice/VKDeviceRenderTarget.cpp similarity index 98% rename from src/RenderDevice/Vulkan/VKDeviceRenderTarget.cpp rename to src/RenderDevice/VKDeviceRenderTarget.cpp index 926365ff..879db3a1 100644 --- a/src/RenderDevice/Vulkan/VKDeviceRenderTarget.cpp +++ b/src/RenderDevice/VKDeviceRenderTarget.cpp @@ -1,4 +1,4 @@ -#include +#include VK_NAMESPACE_BEGIN RenderTarget *Device::CreateRenderTarget(Framebuffer *fb,const uint32_t fence_count) diff --git a/src/RenderDevice/Vulkan/VKDeviceSwapchain.cpp b/src/RenderDevice/VKDeviceSwapchain.cpp similarity index 97% rename from src/RenderDevice/Vulkan/VKDeviceSwapchain.cpp rename to src/RenderDevice/VKDeviceSwapchain.cpp index 53b21675..36d7b6b8 100644 --- a/src/RenderDevice/Vulkan/VKDeviceSwapchain.cpp +++ b/src/RenderDevice/VKDeviceSwapchain.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include VK_NAMESPACE_BEGIN namespace diff --git a/src/RenderDevice/Vulkan/VKDeviceTexture.cpp b/src/RenderDevice/VKDeviceTexture.cpp similarity index 96% rename from src/RenderDevice/Vulkan/VKDeviceTexture.cpp rename to src/RenderDevice/VKDeviceTexture.cpp index 161dd2f3..d1128918 100644 --- a/src/RenderDevice/Vulkan/VKDeviceTexture.cpp +++ b/src/RenderDevice/VKDeviceTexture.cpp @@ -1,12 +1,12 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include VK_NAMESPACE_BEGIN namespace { diff --git a/src/RenderDevice/Vulkan/VKFence.cpp b/src/RenderDevice/VKFence.cpp similarity index 71% rename from src/RenderDevice/Vulkan/VKFence.cpp rename to src/RenderDevice/VKFence.cpp index 382d61e4..26258879 100644 --- a/src/RenderDevice/Vulkan/VKFence.cpp +++ b/src/RenderDevice/VKFence.cpp @@ -1,4 +1,4 @@ -#include +#include VK_NAMESPACE_BEGIN Fence::~Fence() { diff --git a/src/RenderDevice/Vulkan/VKFramebuffer.cpp b/src/RenderDevice/VKFramebuffer.cpp similarity index 69% rename from src/RenderDevice/Vulkan/VKFramebuffer.cpp rename to src/RenderDevice/VKFramebuffer.cpp index 15967925..eb2d086a 100644 --- a/src/RenderDevice/Vulkan/VKFramebuffer.cpp +++ b/src/RenderDevice/VKFramebuffer.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include VK_NAMESPACE_BEGIN diff --git a/src/RenderDevice/Vulkan/VKImageView.cpp b/src/RenderDevice/VKImageView.cpp similarity index 97% rename from src/RenderDevice/Vulkan/VKImageView.cpp rename to src/RenderDevice/VKImageView.cpp index 99e13ae9..b5e26632 100644 --- a/src/RenderDevice/Vulkan/VKImageView.cpp +++ b/src/RenderDevice/VKImageView.cpp @@ -1,4 +1,4 @@ -#include +#include VK_NAMESPACE_BEGIN ImageView::~ImageView() diff --git a/src/RenderDevice/Vulkan/VKInstance.cpp b/src/RenderDevice/VKInstance.cpp similarity index 93% rename from src/RenderDevice/Vulkan/VKInstance.cpp rename to src/RenderDevice/VKInstance.cpp index 654a99a7..af7f4ac1 100644 --- a/src/RenderDevice/Vulkan/VKInstance.cpp +++ b/src/RenderDevice/VKInstance.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include #include VK_NAMESPACE_BEGIN diff --git a/src/RenderDevice/Vulkan/VKMaterial.cpp b/src/RenderDevice/VKMaterial.cpp similarity index 92% rename from src/RenderDevice/Vulkan/VKMaterial.cpp rename to src/RenderDevice/VKMaterial.cpp index e7f46ea2..53c67e78 100644 --- a/src/RenderDevice/Vulkan/VKMaterial.cpp +++ b/src/RenderDevice/VKMaterial.cpp @@ -1,10 +1,10 @@ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include"VKDescriptorSetLayoutCreater.h" VK_NAMESPACE_BEGIN Material *Device::CreateMaterial(ShaderModuleMap *shader_maps) diff --git a/src/RenderDevice/Vulkan/VKMaterialInstance.cpp b/src/RenderDevice/VKMaterialInstance.cpp similarity index 89% rename from src/RenderDevice/Vulkan/VKMaterialInstance.cpp rename to src/RenderDevice/VKMaterialInstance.cpp index 71971c2d..749ecbd4 100644 --- a/src/RenderDevice/Vulkan/VKMaterialInstance.cpp +++ b/src/RenderDevice/VKMaterialInstance.cpp @@ -1,7 +1,7 @@ -#include +#include -#include -#include +#include +#include VK_NAMESPACE_BEGIN MaterialInstance::MaterialInstance(Material *m,DescriptorSets *ds) diff --git a/src/RenderDevice/Vulkan/VKMemory.cpp b/src/RenderDevice/VKMemory.cpp similarity index 93% rename from src/RenderDevice/Vulkan/VKMemory.cpp rename to src/RenderDevice/VKMemory.cpp index eca608ae..37e9ba9d 100644 --- a/src/RenderDevice/Vulkan/VKMemory.cpp +++ b/src/RenderDevice/VKMemory.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include VK_NAMESPACE_BEGIN Memory *Device::CreateMemory(const VkMemoryRequirements &req,uint32_t properties) { diff --git a/src/RenderDevice/Vulkan/VKPhysicalDevice.cpp b/src/RenderDevice/VKPhysicalDevice.cpp similarity index 98% rename from src/RenderDevice/Vulkan/VKPhysicalDevice.cpp rename to src/RenderDevice/VKPhysicalDevice.cpp index d4c84752..3209fc63 100644 --- a/src/RenderDevice/Vulkan/VKPhysicalDevice.cpp +++ b/src/RenderDevice/VKPhysicalDevice.cpp @@ -1,4 +1,4 @@ -#include +#include VK_NAMESPACE_BEGIN PhysicalDevice::PhysicalDevice(VkInstance inst,VkPhysicalDevice pd) diff --git a/src/RenderDevice/Vulkan/VKPipeline.cpp b/src/RenderDevice/VKPipeline.cpp similarity index 87% rename from src/RenderDevice/Vulkan/VKPipeline.cpp rename to src/RenderDevice/VKPipeline.cpp index 7c02a06e..1b563a65 100644 --- a/src/RenderDevice/Vulkan/VKPipeline.cpp +++ b/src/RenderDevice/VKPipeline.cpp @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include VK_NAMESPACE_BEGIN Pipeline::~Pipeline() diff --git a/src/RenderDevice/Vulkan/VKProperties.cpp b/src/RenderDevice/VKProperties.cpp similarity index 97% rename from src/RenderDevice/Vulkan/VKProperties.cpp rename to src/RenderDevice/VKProperties.cpp index 4c8f067a..f5d7ca9e 100644 --- a/src/RenderDevice/Vulkan/VKProperties.cpp +++ b/src/RenderDevice/VKProperties.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include VK_NAMESPACE_BEGIN diff --git a/src/RenderDevice/Vulkan/VKRenderPass.cpp b/src/RenderDevice/VKRenderPass.cpp similarity index 58% rename from src/RenderDevice/Vulkan/VKRenderPass.cpp rename to src/RenderDevice/VKRenderPass.cpp index 2718a637..65e7a598 100644 --- a/src/RenderDevice/Vulkan/VKRenderPass.cpp +++ b/src/RenderDevice/VKRenderPass.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include VK_NAMESPACE_BEGIN RenderPass::~RenderPass() { diff --git a/src/RenderDevice/Vulkan/VKRenderTarget.cpp b/src/RenderDevice/VKRenderTarget.cpp similarity index 95% rename from src/RenderDevice/Vulkan/VKRenderTarget.cpp rename to src/RenderDevice/VKRenderTarget.cpp index 78ef4024..2101ed47 100644 --- a/src/RenderDevice/Vulkan/VKRenderTarget.cpp +++ b/src/RenderDevice/VKRenderTarget.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include VK_NAMESPACE_BEGIN RenderTarget::RenderTarget(Device *dev,Framebuffer *_fb,CommandBuffer *_cb,const uint32_t fence_count):SubmitQueue(dev,dev->GetGraphicsQueue(),fence_count) diff --git a/src/RenderDevice/Vulkan/VKRenderable.cpp b/src/RenderDevice/VKRenderable.cpp similarity index 92% rename from src/RenderDevice/Vulkan/VKRenderable.cpp rename to src/RenderDevice/VKRenderable.cpp index 3387634f..3670ca61 100644 --- a/src/RenderDevice/Vulkan/VKRenderable.cpp +++ b/src/RenderDevice/VKRenderable.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include VK_NAMESPACE_BEGIN //bool Renderable::Set(const int stage_input_binding,VAB *vab,VkDeviceSize offset) diff --git a/src/RenderDevice/Vulkan/VKRenderableInstance.cpp b/src/RenderDevice/VKRenderableInstance.cpp similarity index 92% rename from src/RenderDevice/Vulkan/VKRenderableInstance.cpp rename to src/RenderDevice/VKRenderableInstance.cpp index 20fc1070..bac2f0f6 100644 --- a/src/RenderDevice/Vulkan/VKRenderableInstance.cpp +++ b/src/RenderDevice/VKRenderableInstance.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include VK_NAMESPACE_BEGIN RenderableInstance::RenderableInstance(Renderable *r,MaterialInstance *mi,Pipeline *p,const uint32_t count,VkBuffer *bl,VkDeviceSize *bs) diff --git a/src/RenderDevice/Vulkan/VKSampler.cpp b/src/RenderDevice/VKSampler.cpp similarity index 71% rename from src/RenderDevice/Vulkan/VKSampler.cpp rename to src/RenderDevice/VKSampler.cpp index 513e118c..8aa8d935 100644 --- a/src/RenderDevice/Vulkan/VKSampler.cpp +++ b/src/RenderDevice/VKSampler.cpp @@ -1,4 +1,4 @@ -#include +#include VK_NAMESPACE_BEGIN Sampler::~Sampler() { diff --git a/src/RenderDevice/Vulkan/VKSemaphore.cpp b/src/RenderDevice/VKSemaphore.cpp similarity index 72% rename from src/RenderDevice/Vulkan/VKSemaphore.cpp rename to src/RenderDevice/VKSemaphore.cpp index a95f0060..81eaa6ac 100644 --- a/src/RenderDevice/Vulkan/VKSemaphore.cpp +++ b/src/RenderDevice/VKSemaphore.cpp @@ -1,4 +1,4 @@ -#include +#include VK_NAMESPACE_BEGIN GPUSemaphore::~GPUSemaphore() { diff --git a/src/RenderDevice/Vulkan/VKShaderModule.cpp b/src/RenderDevice/VKShaderModule.cpp similarity index 95% rename from src/RenderDevice/Vulkan/VKShaderModule.cpp rename to src/RenderDevice/VKShaderModule.cpp index ef1a31d4..57267c9e 100644 --- a/src/RenderDevice/Vulkan/VKShaderModule.cpp +++ b/src/RenderDevice/VKShaderModule.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include VK_NAMESPACE_BEGIN ShaderModule *Device::CreateShaderModule(ShaderResource *sr) diff --git a/src/RenderDevice/Vulkan/VKShaderModuleMap.cpp b/src/RenderDevice/VKShaderModuleMap.cpp similarity index 73% rename from src/RenderDevice/Vulkan/VKShaderModuleMap.cpp rename to src/RenderDevice/VKShaderModuleMap.cpp index c14655d7..605eaa06 100644 --- a/src/RenderDevice/Vulkan/VKShaderModuleMap.cpp +++ b/src/RenderDevice/VKShaderModuleMap.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include VK_NAMESPACE_BEGIN bool ShaderModuleMap::Add(const ShaderModule *sm) diff --git a/src/RenderDevice/Vulkan/VKSubmitQueue.cpp b/src/RenderDevice/VKSubmitQueue.cpp similarity index 95% rename from src/RenderDevice/Vulkan/VKSubmitQueue.cpp rename to src/RenderDevice/VKSubmitQueue.cpp index dbdbe029..f9d1c7b8 100644 --- a/src/RenderDevice/Vulkan/VKSubmitQueue.cpp +++ b/src/RenderDevice/VKSubmitQueue.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include VK_NAMESPACE_BEGIN namespace diff --git a/src/RenderDevice/Vulkan/VKSwapchain.cpp b/src/RenderDevice/VKSwapchain.cpp similarity index 86% rename from src/RenderDevice/Vulkan/VKSwapchain.cpp rename to src/RenderDevice/VKSwapchain.cpp index 66a6c816..987416e2 100644 --- a/src/RenderDevice/Vulkan/VKSwapchain.cpp +++ b/src/RenderDevice/VKSwapchain.cpp @@ -1,4 +1,4 @@ -#include +#include VK_NAMESPACE_BEGIN Swapchain::~Swapchain() diff --git a/src/RenderDevice/Vulkan/VKTexture.cpp b/src/RenderDevice/VKTexture.cpp similarity index 75% rename from src/RenderDevice/Vulkan/VKTexture.cpp rename to src/RenderDevice/VKTexture.cpp index 1e6ef7ab..b8cbe216 100644 --- a/src/RenderDevice/Vulkan/VKTexture.cpp +++ b/src/RenderDevice/VKTexture.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include VK_NAMESPACE_BEGIN Texture::~Texture() { diff --git a/src/RenderDevice/Vulkan/VKTextureLoader.cpp b/src/RenderDevice/VKTextureLoader.cpp similarity index 98% rename from src/RenderDevice/Vulkan/VKTextureLoader.cpp rename to src/RenderDevice/VKTextureLoader.cpp index 7415dfce..c5d937dd 100644 --- a/src/RenderDevice/Vulkan/VKTextureLoader.cpp +++ b/src/RenderDevice/VKTextureLoader.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/RenderDevice/Vulkan/VKTileData.cpp b/src/RenderDevice/VKTileData.cpp similarity index 96% rename from src/RenderDevice/Vulkan/VKTileData.cpp rename to src/RenderDevice/VKTileData.cpp index 7b09119e..b199cb03 100644 --- a/src/RenderDevice/Vulkan/VKTileData.cpp +++ b/src/RenderDevice/VKTileData.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include namespace diff --git a/src/RenderDevice/Vulkan/VKTileFont.cpp b/src/RenderDevice/VKTileFont.cpp similarity index 95% rename from src/RenderDevice/Vulkan/VKTileFont.cpp rename to src/RenderDevice/VKTileFont.cpp index 4f046308..43e9d2a1 100644 --- a/src/RenderDevice/Vulkan/VKTileFont.cpp +++ b/src/RenderDevice/VKTileFont.cpp @@ -1,5 +1,5 @@ #include -#include +#include VK_NAMESPACE_BEGIN /** diff --git a/src/RenderDevice/Vulkan/VKVertexAttributeBinding.cpp b/src/RenderDevice/VKVertexAttributeBinding.cpp similarity index 93% rename from src/RenderDevice/Vulkan/VKVertexAttributeBinding.cpp rename to src/RenderDevice/VKVertexAttributeBinding.cpp index 6caf4cbc..57120012 100644 --- a/src/RenderDevice/Vulkan/VKVertexAttributeBinding.cpp +++ b/src/RenderDevice/VKVertexAttributeBinding.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include VK_NAMESPACE_BEGIN VertexAttributeBinding::VertexAttributeBinding(const uint32_t count,const VkVertexInputBindingDescription *bind_list,const VkVertexInputAttributeDescription *attr_list) diff --git a/src/RenderDevice/Vulkan/CMakeLists.txt b/src/RenderDevice/Vulkan/CMakeLists.txt deleted file mode 100644 index 4a2a3a2c..00000000 --- a/src/RenderDevice/Vulkan/CMakeLists.txt +++ /dev/null @@ -1,123 +0,0 @@ -set(RD_INCLUDE_PATH ${ROOT_INCLUDE_PATH}/hgl/graph/vulkan) - -SET(VK_DB_SOURCE ${RD_INCLUDE_PATH}/VKDatabase.h - VKDatabase.cpp - VKDatabaseMaterial.cpp) - -SOURCE_GROUP("Database" FILES ${VK_DB_SOURCE}) - -SET(VK_INST_SOURCE ${RD_INCLUDE_PATH}/VKInstance.h - VKInstance.cpp) - -SET(VK_DEBUG_SOURCE ${RD_INCLUDE_PATH}/VKDebugOut.h - VKDebugOut.cpp) - -SET(VK_MEMORY_SOURCE ${RD_INCLUDE_PATH}/VKMemory.h - ${RD_INCLUDE_PATH}/VKBuffer.h - VKMemory.cpp - VKBuffer.cpp) - -SET(VK_DEVICE_SOURCE ${RD_INCLUDE_PATH}/VKDevice.h - ${RD_INCLUDE_PATH}/VKDeviceAttribute.h - VKDeviceAttribute.cpp - VKDeviceCreater.cpp - VKDevice.cpp - VKDeviceBuffer.cpp - VKDeviceImage.cpp - VKDeviceTexture.cpp - VKDeviceFramebuffer.cpp - VKDeviceSwapchain.cpp - VKDeviceRenderPass.cpp - VKDeviceRenderTarget.cpp) - -SET(VK_PHYSICAL_DEVICE_SOURCE ${RD_INCLUDE_PATH}/VKPhysicalDevice.h - VKPhysicalDevice.cpp - VKProperties.cpp) - -SOURCE_GROUP("Device" FILES ${VK_DEVICE_SOURCE}) -SOURCE_GROUP("Device\\Debug" FILES ${VK_DEBUG_SOURCE}) -SOURCE_GROUP("Device\\Instance" FILES ${VK_INST_SOURCE}) -SOURCE_GROUP("Device\\Physical Device" FILES ${VK_PHYSICAL_DEVICE_SOURCE}) -SOURCE_GROUP("Device\\Memory" FILES ${VK_MEMORY_SOURCE}) - -SET(VK_DESCRIPTOR_SETS_SOURCE ${RD_INCLUDE_PATH}/VKDescriptorSets.h - VKDescriptorSets.cpp - VKDescriptorSetLayoutCreater.cpp - VKDescriptorSetLayoutCreater.h) - -SOURCE_GROUP("Descriptor Sets" FILES ${VK_DESCRIPTOR_SETS_SOURCE}) - -SET(VK_SHADER_SOURCE ${RD_INCLUDE_PATH}/VKShaderModule.h - ${RD_INCLUDE_PATH}/VKShaderModuleMap.h - VKShaderModuleMap.cpp - VKShaderModule.cpp) - -SET(VK_TEXTURE_SOURCE ${RD_INCLUDE_PATH}/VKImageView.h - ${RD_INCLUDE_PATH}/VKTexture.h - ${RD_INCLUDE_PATH}/VKSampler.h - VKSampler.cpp - VKImageView.cpp - VKTexture.cpp - VKTextureLoader.cpp) - -SET(VK_MATERIAL_SOURCE ${RD_INCLUDE_PATH}/VKMaterial.h - ${RD_INCLUDE_PATH}/VKMaterialInstance.h - VKMaterial.cpp - VKMaterialInstance.cpp) - -SOURCE_GROUP("Material" FILES ${VK_MATERIAL_SOURCE}) -SOURCE_GROUP("Material\\Texture" FILES ${VK_TEXTURE_SOURCE}) -SOURCE_GROUP("Material\\Shader" FILES ${VK_SHADER_SOURCE}) - -SET(VK_RENDER_PASS_SOURCE ${RD_INCLUDE_PATH}/VKFramebuffer.h - ${RD_INCLUDE_PATH}/VKPipeline.h - ${RD_INCLUDE_PATH}/VKRenderPass.h - ${RD_INCLUDE_PATH}/VKRenderTarget.h - ${RD_INCLUDE_PATH}/VKSwapchain.h - ${RD_INCLUDE_PATH}/VKCommandBuffer.h - ${RD_INCLUDE_PATH}/VKSemaphore.h - ${RD_INCLUDE_PATH}/VKFence.h - VKSubmitQueue.cpp - VKSemaphore.cpp - VKFence.cpp - VKFramebuffer.cpp - VKPipeline.cpp - VKRenderPass.cpp - VKRenderTarget.cpp - VKSwapchain.cpp - VKCommandBuffer.cpp) - -SOURCE_GROUP("Render Pass" FILES ${VK_RENDER_PASS_SOURCE}) - -SET(VK_RENDERABLE_SOURCE ${RD_INCLUDE_PATH}/VKVertexAttributeBinding.h - ${RD_INCLUDE_PATH}/VKRenderable.h - ${RD_INCLUDE_PATH}/VKRenderableInstance.h - VKVertexAttributeBinding.cpp - VKRenderable.cpp - VKRenderableInstance.cpp - VKTileData.cpp - VKTileFont.cpp) - -SOURCE_GROUP("Renderable" FILES ${VK_RENDERABLE_SOURCE}) - -IF(WIN32) - OPTION(FORCE_DISCETE_GPU "Force Discrete GPU" OFF) - - IF(FORCE_DISCETE_GPU) - SET(RENDER_DEVICE_SOURCE ForceDiscreteGPU.c) - ENDIF() -ENDIF(WIN32) - -add_cm_library(ULRE.RenderDevice.Vulkan "ULRE" ${VK_DB_SOURCE} - ${VK_INST_SOURCE} - ${VK_DEBUG_SOURCE} - ${VK_MEMORY_SOURCE} - ${VK_DEVICE_SOURCE} - ${VK_PHYSICAL_DEVICE_SOURCE} - ${VK_DESCRIPTOR_SETS_SOURCE} - ${VK_SHADER_SOURCE} - ${VK_TEXTURE_SOURCE} - ${VK_MATERIAL_SOURCE} - ${VK_RENDER_PASS_SOURCE} - ${VK_RENDERABLE_SOURCE} - ${VK_RENDER_DEVICE_SOURCE}) diff --git a/src/SceneGraph/InlineGeometry.cpp b/src/SceneGraph/InlineGeometry.cpp index e37db70f..44f634ff 100644 --- a/src/SceneGraph/InlineGeometry.cpp +++ b/src/SceneGraph/InlineGeometry.cpp @@ -3,9 +3,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include namespace hgl diff --git a/src/SceneGraph/RenderList.cpp b/src/SceneGraph/RenderList.cpp index cc6bcc16..41749d0e 100644 --- a/src/SceneGraph/RenderList.cpp +++ b/src/SceneGraph/RenderList.cpp @@ -1,11 +1,11 @@ #include #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include namespace hgl { diff --git a/src/SceneGraph/RenderableCreater.cpp b/src/SceneGraph/RenderableCreater.cpp index 45404647..df3773b7 100644 --- a/src/SceneGraph/RenderableCreater.cpp +++ b/src/SceneGraph/RenderableCreater.cpp @@ -1,5 +1,5 @@ #include -#include +#include namespace hgl { diff --git a/src/SceneGraph/TileData.cpp b/src/SceneGraph/TileData.cpp index 86faf184..714e4ca5 100644 --- a/src/SceneGraph/TileData.cpp +++ b/src/SceneGraph/TileData.cpp @@ -1,7 +1,7 @@ #include #include -#include -#include +#include +#include namespace hgl { diff --git a/src/SceneGraph/font/TextRenderable.cpp b/src/SceneGraph/font/TextRenderable.cpp index 877b2e06..ee1c2d95 100644 --- a/src/SceneGraph/font/TextRenderable.cpp +++ b/src/SceneGraph/font/TextRenderable.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include namespace hgl { diff --git a/src/SceneGraph/font/TileFont.cpp b/src/SceneGraph/font/TileFont.cpp index bf8d0e90..aefa2cb4 100644 --- a/src/SceneGraph/font/TileFont.cpp +++ b/src/SceneGraph/font/TileFont.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include namespace hgl { diff --git a/src/SceneGraph/shader/ShaderResource.cpp b/src/SceneGraph/shader/ShaderResource.cpp index b6ca4c7a..6f9f8744 100644 --- a/src/SceneGraph/shader/ShaderResource.cpp +++ b/src/SceneGraph/shader/ShaderResource.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include VK_NAMESPACE_BEGIN