Proper image layout for descriptor image infos (instead of always GENERAL), code cleanup, comments

This commit is contained in:
saschawillems 2017-01-04 21:49:26 +01:00
parent 5485e77d30
commit 251560845c
4 changed files with 25 additions and 20 deletions

View file

@ -547,12 +547,16 @@ public:
&uniformBufferVS.descriptor));
// Binding 1: Sampled image
VkDescriptorImageInfo texDescriptor = vkTools::initializers::descriptorImageInfo(VK_NULL_HANDLE, texture.view, VK_IMAGE_LAYOUT_GENERAL);
VkDescriptorImageInfo textureDescriptor =
vkTools::initializers::descriptorImageInfo(
VK_NULL_HANDLE,
texture.view,
texture.imageLayout);
writeDescriptorSets.push_back(vkTools::initializers::writeDescriptorSet(
descriptorSet,
VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE,
1,
&texDescriptor));
&textureDescriptor));
// Binding 2: Sampler array
std::vector<VkDescriptorImageInfo> samplerDescriptors;