kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added KRTexture::TextureHandle::destroy to eliminate duplicate code in KRTexture::destroyHandles and KRTexture::destroyNewHandles.

Browse Source 
Now creating an image view for each KRTexture for full access.
This commit is contained in:
Kearwood Gilbert
2022-07-24 23:57:01 -07:00
parent 9eb9cfe7c5
commit 6551e6d8a6
3 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
kraken/KRTexture.cpp
View File

@@ -53,13 +53,25 @@ KRTexture::~KRTexture()
releaseHandles(); releaseHandles();
} }
void KRTexture::TextureHandle::destroy(KRDeviceManager* deviceManager)
{
std::unique_ptr<KRDevice>& d = deviceManager->getDevice(device);
// TODO - Validate that device has not been lost
if (fullImageView != VK_NULL_HANDLE) {
vkDestroyImageView(d->m_logicalDevice, fullImageView, nullptr);
fullImageView = VK_NULL_HANDLE;
}
if (image != VK_NULL_HANDLE) {
VmaAllocator allocator = d->getAllocator();
vmaDestroyImage(allocator, image, allocation);
}
}
void KRTexture::destroyHandles() void KRTexture::destroyHandles()
{ {
KRDeviceManager* deviceManager = getContext().getDeviceManager(); KRDeviceManager* deviceManager = getContext().getDeviceManager();
for (TextureHandle t : m_handles) { for (TextureHandle t : m_handles) {
std::unique_ptr<KRDevice>& device = deviceManager->getDevice(t.device); t.destroy(deviceManager);
VmaAllocator allocator = device->getAllocator();
vmaDestroyImage(allocator, t.image, t.allocation);
} }
m_handles.clear(); m_handles.clear();
m_textureMemUsed = 0; m_textureMemUsed = 0;
@@ -69,9 +81,7 @@ void KRTexture::destroyNewHandles()
{ {
KRDeviceManager* deviceManager = getContext().getDeviceManager(); KRDeviceManager* deviceManager = getContext().getDeviceManager();
for (TextureHandle t : m_newHandles) { for (TextureHandle t : m_newHandles) {
std::unique_ptr<KRDevice>& device = deviceManager->getDevice(t.device); t.destroy(deviceManager);
VmaAllocator allocator = device->getAllocator();
vmaDestroyImage(allocator, t.image, t.allocation);
} }
m_newHandles.clear(); m_newHandles.clear();
m_newTextureMemUsed = 0; m_newTextureMemUsed = 0;

4
kraken/KRTexture.h
View File

@@ -37,6 +37,7 @@
class KRDataBlock; class KRDataBlock;
class KRCamera; class KRCamera;
class KRDeviceManager;
class KRTexture : public KRResource { class KRTexture : public KRResource {
public: public:
@@ -95,8 +96,11 @@ protected:
struct TextureHandle { struct TextureHandle {
VkImage image; VkImage image;
VkImageView fullImageView;
KrDeviceHandle device; KrDeviceHandle device;
VmaAllocation allocation; VmaAllocation allocation;
void destroy(KRDeviceManager* deviceManager);
}; };
std::vector<TextureHandle> m_handles; std::vector<TextureHandle> m_handles;

16
kraken/KRTexture2D.cpp
View File

@@ -70,6 +70,22 @@ bool KRTexture2D::createGPUTexture(int lod_max_dim) {
break; break;
} }
VkImageViewCreateInfo viewInfo{};
viewInfo.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
viewInfo.image = texture.image;
viewInfo.viewType = VK_IMAGE_VIEW_TYPE_2D;
viewInfo.format = VK_FORMAT_R8G8B8A8_SRGB;
viewInfo.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
viewInfo.subresourceRange.baseMipLevel = 0;
viewInfo.subresourceRange.levelCount = 1;
viewInfo.subresourceRange.baseArrayLayer = 0;
viewInfo.subresourceRange.layerCount = 1;
VkResult res = vkCreateImageView(device.m_logicalDevice, &viewInfo, nullptr, &texture.fullImageView);
if(res != VK_SUCCESS) {
success = false;
break;
}
if (!uploadTexture(device, texture.image, lod_max_dim, m_new_lod_max_dim)) { if (!uploadTexture(device, texture.image, lod_max_dim, m_new_lod_max_dim)) {
success = false; success = false;
break; break;