DescriptorBuildInfo

Author: azer89

HelloVulkan/Header/DescriptorBuildInfo.h

@@ -17,8 +17,8 @@ struct DescriptorSetWrite
 	VkDescriptorBufferInfo* bufferInfoPtr_ = nullptr;
 	// If you have an array of buffers/images, descriptorCount_ must be bigger than one
 	uint32_t descriptorCount_ = 1u;
-	VkDescriptorType type_;
-	VkShaderStageFlags shaderFlags_; // TODO rename to stageFlags_
+	VkDescriptorType descriptorType_;
+	VkShaderStageFlags shaderStage_;
 };
 
 class DescriptorBuildInfo
@@ -46,15 +46,17 @@ class DescriptorBuildInfo
 	void UpdateImage(const VulkanImage* image, size_t bindingIndex);
 
 	// Descriptor indexing
+	// TODO imageArrays is not stored so you need to supply it again if you update the descriptors
 	void AddImageArray(
-		const std::vector<VkDescriptorImageInfo>& imageArrays,
+		const std::vector<VkDescriptorImageInfo>& imageArray,
 		VkDescriptorType dsType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
 		VkShaderStageFlags stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT);
 
 	// Raytracing
 	void AddAccelerationStructure();
 	void AddAccelerationStructure(VkWriteDescriptorSetAccelerationStructureKHR* asInfo);
 	void UpdateStorageImage(const VulkanImage* image, size_t bindingIndex);
+	// TODO asInfo is not stored so you need to supply it again if you update the descriptors
 	void UpdateAccelerationStructure(VkWriteDescriptorSetAccelerationStructureKHR* asInfo, size_t bindingIndex);
 
 private:

HelloVulkan/Source/DescriptorBuildInfo.cpp

@@ -22,8 +22,8 @@ void DescriptorBuildInfo::AddBuffer(
 	({
 		.bufferInfoPtr_ = bufferInfo,
 		.descriptorCount_ = 1u,
-		.type_ = dsType,
-		.shaderFlags_ = stageFlags
+		.descriptorType_ = dsType,
+		.shaderStage_ = stageFlags
 		});
 }
 
@@ -45,25 +45,25 @@ void DescriptorBuildInfo::AddImage(
 	({
 		.imageInfoPtr_ = imageInfo,
 		.descriptorCount_ = 1u,
-		.type_ = dsType,
-		.shaderFlags_ = stageFlags
+		.descriptorType_ = dsType,
+		.shaderStage_ = stageFlags
 		});
 }
 
 // Special case for descriptor indexing
 void DescriptorBuildInfo::AddImageArray(
-	const std::vector<VkDescriptorImageInfo>& imageArrays,
+	const std::vector<VkDescriptorImageInfo>& imageArray,
 	VkDescriptorType dsType,
 	VkShaderStageFlags stageFlags)
 {
-	imageArrays_ = imageArrays;
+	imageArrays_ = imageArray;
 
 	writes_.push_back
 	({
 		.imageInfoPtr_ = imageArrays_.data(),
 		.descriptorCount_ = static_cast<uint32_t>(imageArrays_.size()),
-		.type_ = dsType,
-		.shaderFlags_ = stageFlags
+		.descriptorType_ = dsType,
+		.shaderStage_ = stageFlags
 		});
 }
 
@@ -73,8 +73,8 @@ void DescriptorBuildInfo::AddAccelerationStructure()
 	writes_.push_back
 	({
 		.descriptorCount_ = 1u,
-		.type_ = VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR,
-		.shaderFlags_ = VK_SHADER_STAGE_RAYGEN_BIT_KHR
+		.descriptorType_ = VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR,
+		.shaderStage_ = VK_SHADER_STAGE_RAYGEN_BIT_KHR
 		});
 }
 
@@ -85,8 +85,8 @@ void DescriptorBuildInfo::AddAccelerationStructure(VkWriteDescriptorSetAccelerat
 	({
 		.pNext_ = asInfo,
 		.descriptorCount_ = 1u,
-		.type_ = VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR,
-		.shaderFlags_ = VK_SHADER_STAGE_RAYGEN_BIT_KHR
+		.descriptorType_ = VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR,
+		.shaderStage_ = VK_SHADER_STAGE_RAYGEN_BIT_KHR
 		});
 }
 

HelloVulkan/Source/VulkanDescriptor.cpp

@@ -19,23 +19,23 @@ void VulkanDescriptor::CreatePoolAndLayout(
 	// Create pool
 	for (auto& write : buildInfo.writes_)
 	{
-		if (write.type_ == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER)
+		if (write.descriptorType_ == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER)
 		{
 			uboCount++;
 		}
-		else if(write.type_ == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)
+		else if(write.descriptorType_ == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)
 		{
 			ssboCount++;
 		}
-		else if (write.type_ == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER)
+		else if (write.descriptorType_ == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER)
 		{
 			samplerCount++;
 		}
-		else if (write.type_ == VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR)
+		else if (write.descriptorType_ == VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR)
 		{
 			accelerationStructureCount++;
 		}
-		else if (write.type_ == VK_DESCRIPTOR_TYPE_STORAGE_IMAGE)
+		else if (write.descriptorType_ == VK_DESCRIPTOR_TYPE_STORAGE_IMAGE)
 		{
 			storageImageCount++;
 		}
@@ -112,8 +112,8 @@ void VulkanDescriptor::CreatePoolAndLayout(
 			CreateDescriptorSetLayoutBinding
 			(
 				bindingIndex++,
-				write.type_,
-				write.shaderFlags_,
+				write.descriptorType_,
+				write.shaderStage_,
 				write.descriptorCount_
 			)
 		);
@@ -171,7 +171,7 @@ void VulkanDescriptor::UpdateSet(
 			.dstBinding = bindIndex++,
 			.dstArrayElement = 0,
 			.descriptorCount = buildInfo.writes_[i].descriptorCount_,
-			.descriptorType = buildInfo.writes_[i].type_,
+			.descriptorType = buildInfo.writes_[i].descriptorType_,
 			.pImageInfo = buildInfo.writes_[i].imageInfoPtr_,
 			.pBufferInfo = buildInfo.writes_[i].bufferInfoPtr_,
 			.pTexelBufferView = nullptr