claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added descriptor info to texture struct

Browse source
This commit is contained in:
saschawillems 2016-06-14 19:01:29 +02:00
parent 03dd118420
commit b7dae92ed8
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
base/vulkanTextureLoader.hpp
View file

@ -28,6 +28,7 @@ namespace vkTools
uint32_t width, height; uint32_t width, height;
uint32_t mipLevels; uint32_t mipLevels;
uint32_t layerCount; uint32_t layerCount;
VkDescriptorImageInfo descriptor;
}; };
class VulkanTextureLoader class VulkanTextureLoader
@ -383,6 +384,11 @@ namespace vkTools
view.subresourceRange.levelCount = (useStaging) ? texture->mipLevels : 1; view.subresourceRange.levelCount = (useStaging) ? texture->mipLevels : 1;
view.image = texture->image; view.image = texture->image;
VK_CHECK_RESULT(vkCreateImageView(device, &view, nullptr, &texture->view)); VK_CHECK_RESULT(vkCreateImageView(device, &view, nullptr, &texture->view));
// Fill descriptor image info that can be used for setting up descriptor sets
texture->descriptor.imageLayout = VK_IMAGE_LAYOUT_GENERAL;
texture->descriptor.imageView = texture->view;
texture->descriptor.sampler = texture->sampler;
} }
// Clean up vulkan resources used by a texture object // Clean up vulkan resources used by a texture object
@ -601,6 +607,11 @@ namespace vkTools
// Clean up staging resources // Clean up staging resources
vkFreeMemory(device, stagingMemory, nullptr); vkFreeMemory(device, stagingMemory, nullptr);
vkDestroyBuffer(device, stagingBuffer, nullptr); vkDestroyBuffer(device, stagingBuffer, nullptr);
// Fill descriptor image info that can be used for setting up descriptor sets
texture->descriptor.imageLayout = VK_IMAGE_LAYOUT_GENERAL;
texture->descriptor.imageView = texture->view;
texture->descriptor.sampler = texture->sampler;
} }
// Load an array texture (single file) // Load an array texture (single file)
@ -825,10 +836,12 @@ namespace vkTools
// Clean up staging resources // Clean up staging resources
vkFreeMemory(device, stagingMemory, nullptr); vkFreeMemory(device, stagingMemory, nullptr);
vkDestroyBuffer(device, stagingBuffer, nullptr); vkDestroyBuffer(device, stagingBuffer, nullptr);
// Fill descriptor image info that can be used for setting up descriptor sets
texture->descriptor.imageLayout = VK_IMAGE_LAYOUT_GENERAL;
texture->descriptor.imageView = texture->view;
texture->descriptor.sampler = texture->sampler;
} }
}; };
}; };