From fb15e1bf5e960579280e22ccecfdf1b0a46e886b Mon Sep 17 00:00:00 2001 From: hyzboy Date: Thu, 16 Dec 2021 20:59:16 +0800 Subject: [PATCH] splited and created VKDeviceMemory.cpp --- src/SceneGraph/CMakeLists.txt | 1 + src/SceneGraph/Vulkan/VKDebugMaker.cpp | 8 ++++---- src/SceneGraph/Vulkan/VKDeviceImage.cpp | 19 ------------------- src/SceneGraph/Vulkan/VKDeviceMemory.cpp | 22 ++++++++++++++++++++++ 4 files changed, 27 insertions(+), 23 deletions(-) create mode 100644 src/SceneGraph/Vulkan/VKDeviceMemory.cpp diff --git a/src/SceneGraph/CMakeLists.txt b/src/SceneGraph/CMakeLists.txt index bdfd658c..c21e92c1 100644 --- a/src/SceneGraph/CMakeLists.txt +++ b/src/SceneGraph/CMakeLists.txt @@ -118,6 +118,7 @@ SET(VK_DEVICE_SOURCE ${SG_INCLUDE_PATH}/VKDevice.h Vulkan/VKDeviceAttribute.cpp Vulkan/VKDeviceCreater.cpp Vulkan/VKDevice.cpp + Vulkan/VKDeviceMemory.cpp Vulkan/VKDeviceBuffer.cpp Vulkan/VKDeviceImage.cpp Vulkan/VKDeviceTexture.cpp diff --git a/src/SceneGraph/Vulkan/VKDebugMaker.cpp b/src/SceneGraph/Vulkan/VKDebugMaker.cpp index bf8defbe..9aa6981c 100644 --- a/src/SceneGraph/Vulkan/VKDebugMaker.cpp +++ b/src/SceneGraph/Vulkan/VKDebugMaker.cpp @@ -75,10 +75,10 @@ DebugMaker *CreateDebugMaker(VkDevice device) dmf.End = reinterpret_cast(vkGetDeviceProcAddr(device, "vkCmdDebugMarkerEndEXT")); dmf.Insert = reinterpret_cast(vkGetDeviceProcAddr(device, "vkCmdDebugMarkerInsertEXT")); - if(!dmf.SetObjectTag )return(nullptr); - if(!dmf.SetObjectName )return(nullptr); - if(!dmf.Begin )return(nullptr); - if(!dmf.End )return(nullptr); + if(!dmf.SetObjectTag )return(nullptr); + if(!dmf.SetObjectName )return(nullptr); + if(!dmf.Begin )return(nullptr); + if(!dmf.End )return(nullptr); if(!dmf.Insert )return(nullptr); return(new DebugMaker(device,dmf)); diff --git a/src/SceneGraph/Vulkan/VKDeviceImage.cpp b/src/SceneGraph/Vulkan/VKDeviceImage.cpp index 93cf92b7..fda808d7 100644 --- a/src/SceneGraph/Vulkan/VKDeviceImage.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceImage.cpp @@ -22,23 +22,4 @@ void GPUDevice::DestroyImage(VkImage img) vkDestroyImage(attr->device,img,nullptr); } - -GPUMemory *GPUDevice::CreateMemory(VkImage image,const uint32_t flag) -{ - VkMemoryRequirements memReqs; - - vkGetImageMemoryRequirements(attr->device,image,&memReqs); - - GPUMemory *mem=CreateMemory(memReqs,flag); - - if(!mem)return(nullptr); - - if(!mem->BindImage(image)) - { - delete mem; - return(nullptr); - } - - return(mem); -} VK_NAMESPACE_END diff --git a/src/SceneGraph/Vulkan/VKDeviceMemory.cpp b/src/SceneGraph/Vulkan/VKDeviceMemory.cpp new file mode 100644 index 00000000..c8fa1fd7 --- /dev/null +++ b/src/SceneGraph/Vulkan/VKDeviceMemory.cpp @@ -0,0 +1,22 @@ +#include + +VK_NAMESPACE_BEGIN +GPUMemory *GPUDevice::CreateMemory(VkImage image,const uint32_t flag) +{ + VkMemoryRequirements memReqs; + + vkGetImageMemoryRequirements(attr->device,image,&memReqs); + + GPUMemory *mem=CreateMemory(memReqs,flag); + + if(!mem)return(nullptr); + + if(!mem->BindImage(image)) + { + delete mem; + return(nullptr); + } + + return(mem); +} +VK_NAMESPACE_END