diff --git a/src/SceneGraph/CMakeLists.txt b/src/SceneGraph/CMakeLists.txt index be54bb79..a012812b 100644 --- a/src/SceneGraph/CMakeLists.txt +++ b/src/SceneGraph/CMakeLists.txt @@ -141,10 +141,10 @@ SET(VK_MEMORY_SOURCE ${SG_INCLUDE_PATH}/VKMemory.h SET(VK_DEVICE_TEXTURE_SOURCE Vulkan/Texture/BufferImageCopy2D.h Vulkan/Texture/GenMipmaps.cpp - Vulkan/Texture/VKDeviceTexture.cpp - Vulkan/Texture/VKDeviceTexture2D.cpp - Vulkan/Texture/VKDeviceTexture2DArray.cpp - Vulkan/Texture/VKDeviceTextureCube.cpp) + Vulkan/Texture/VKTexture.cpp + Vulkan/Texture/VKTexture2D.cpp + Vulkan/Texture/VKTexture2DArray.cpp + Vulkan/Texture/VKTextureCube.cpp) SET(VK_TEXTURE_LOADER_SOURCE ${SG_INCLUDE_PATH}/VKTextureCreateInfo.h Vulkan/Texture/VKTextureLoader.h diff --git a/src/SceneGraph/Vulkan/Texture/VKDeviceTexture.cpp b/src/SceneGraph/Vulkan/Texture/VKTexture.cpp similarity index 100% rename from src/SceneGraph/Vulkan/Texture/VKDeviceTexture.cpp rename to src/SceneGraph/Vulkan/Texture/VKTexture.cpp diff --git a/src/SceneGraph/Vulkan/Texture/VKDeviceTexture2D.cpp b/src/SceneGraph/Vulkan/Texture/VKTexture2D.cpp similarity index 100% rename from src/SceneGraph/Vulkan/Texture/VKDeviceTexture2D.cpp rename to src/SceneGraph/Vulkan/Texture/VKTexture2D.cpp diff --git a/src/SceneGraph/Vulkan/Texture/VKDeviceTexture2DArray.cpp b/src/SceneGraph/Vulkan/Texture/VKTexture2DArray.cpp similarity index 100% rename from src/SceneGraph/Vulkan/Texture/VKDeviceTexture2DArray.cpp rename to src/SceneGraph/Vulkan/Texture/VKTexture2DArray.cpp diff --git a/src/SceneGraph/Vulkan/Texture/VKDeviceTextureCube.cpp b/src/SceneGraph/Vulkan/Texture/VKTextureCube.cpp similarity index 100% rename from src/SceneGraph/Vulkan/Texture/VKDeviceTextureCube.cpp rename to src/SceneGraph/Vulkan/Texture/VKTextureCube.cpp diff --git a/src/SceneGraph/Vulkan/VKDeviceImage.cpp b/src/SceneGraph/Vulkan/VKDeviceImage.cpp index fda808d7..9127eaf8 100644 --- a/src/SceneGraph/Vulkan/VKDeviceImage.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceImage.cpp @@ -1,8 +1,8 @@ -#include +#include #include VK_NAMESPACE_BEGIN -VkImage GPUDevice::CreateImage(VkImageCreateInfo *ici) +VkImage TextureManager::CreateImage(VkImageCreateInfo *ici) { if(!ici)return(VK_NULL_HANDLE); if(!CheckVulkanFormat(ici->format))return(VK_NULL_HANDLE); @@ -10,16 +10,16 @@ VkImage GPUDevice::CreateImage(VkImageCreateInfo *ici) VkImage image; - if(vkCreateImage(attr->device,ici, nullptr, &image)!=VK_SUCCESS) + if(vkCreateImage(GetVkDevice(),ici, nullptr, &image)!=VK_SUCCESS) return(nullptr); return image; } -void GPUDevice::DestroyImage(VkImage img) +void TextureManager::DestroyImage(VkImage img) { if(img==VK_NULL_HANDLE)return; - vkDestroyImage(attr->device,img,nullptr); + vkDestroyImage(GetVkDevice(),img,nullptr); } VK_NAMESPACE_END