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

@ -470,11 +470,11 @@ public:
void setupDescriptorSets()
{
// Image descriptor for the cube map texture
VkDescriptorImageInfo cubeMapDescriptor =
VkDescriptorImageInfo textureDescriptor =
vkTools::initializers::descriptorImageInfo(
cubeMap.sampler,
cubeMap.view,
VK_IMAGE_LAYOUT_GENERAL);
cubeMap.imageLayout);
VkDescriptorSetAllocateInfo allocInfo =
vkTools::initializers::descriptorSetAllocateInfo(
@ -498,7 +498,7 @@ public:
descriptorSets.object,
VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
1,
&cubeMapDescriptor)
&textureDescriptor)
};
vkUpdateDescriptorSets(device, writeDescriptorSets.size(), writeDescriptorSets.data(), 0, NULL);
@ -518,7 +518,7 @@ public:
descriptorSets.skybox,
VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
1,
&cubeMapDescriptor)
&textureDescriptor)
};
vkUpdateDescriptorSets(device, writeDescriptorSets.size(), writeDescriptorSets.data(), 0, NULL);
}