Fix code style inconcistency in vkAllocateDescriptorSets

Overv · Overv · commit 717fb50a47dd · 2018-09-16T00:58:27.000+02:00
diff --git a/05_Uniform_buffers/01_Descriptor_pool_and_sets.md b/05_Uniform_buffers/01_Descriptor_pool_and_sets.md
@@ -129,7 +129,7 @@ std::vector<VkDescriptorSet> descriptorSets;
 ...
 
 descriptorSets.resize(swapChainImages.size());
-if (vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets[0]) != VK_SUCCESS) {
+if (vkAllocateDescriptorSets(device, &allocInfo, descriptorSets.data()) != VK_SUCCESS) {
     throw std::runtime_error("failed to allocate descriptor sets!");
 }
 ```
diff --git a/code/22_descriptor_sets.cpp b/code/22_descriptor_sets.cpp
@@ -778,7 +778,7 @@ class HelloTriangleApplication {
         allocInfo.pSetLayouts = layouts.data();
 
         descriptorSets.resize(swapChainImages.size());
-        if (vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets[0]) != VK_SUCCESS) {
+        if (vkAllocateDescriptorSets(device, &allocInfo, descriptorSets.data()) != VK_SUCCESS) {
             throw std::runtime_error("failed to allocate descriptor sets!");
         }
 
diff --git a/code/23_texture_image.cpp b/code/23_texture_image.cpp
@@ -923,7 +923,7 @@ class HelloTriangleApplication {
         allocInfo.pSetLayouts = layouts.data();
 
         descriptorSets.resize(swapChainImages.size());
-        if (vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets[0]) != VK_SUCCESS) {
+        if (vkAllocateDescriptorSets(device, &allocInfo, descriptorSets.data()) != VK_SUCCESS) {
             throw std::runtime_error("failed to allocate descriptor sets!");
         }
 
diff --git a/code/24_sampler.cpp b/code/24_sampler.cpp
@@ -959,7 +959,7 @@ class HelloTriangleApplication {
         allocInfo.pSetLayouts = layouts.data();
 
         descriptorSets.resize(swapChainImages.size());
-        if (vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets[0]) != VK_SUCCESS) {
+        if (vkAllocateDescriptorSets(device, &allocInfo, descriptorSets.data()) != VK_SUCCESS) {
             throw std::runtime_error("failed to allocate descriptor sets!");
         }
 
diff --git a/code/25_texture_mapping.cpp b/code/25_texture_mapping.cpp
@@ -975,7 +975,7 @@ class HelloTriangleApplication {
         allocInfo.pSetLayouts = layouts.data();
 
         descriptorSets.resize(swapChainImages.size());
-        if (vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets[0]) != VK_SUCCESS) {
+        if (vkAllocateDescriptorSets(device, &allocInfo, descriptorSets.data()) != VK_SUCCESS) {
             throw std::runtime_error("failed to allocate descriptor sets!");
         }
 
diff --git a/code/26_depth_buffering.cpp b/code/26_depth_buffering.cpp
@@ -1070,7 +1070,7 @@ class HelloTriangleApplication {
         allocInfo.pSetLayouts = layouts.data();
 
         descriptorSets.resize(swapChainImages.size());
-        if (vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets[0]) != VK_SUCCESS) {
+        if (vkAllocateDescriptorSets(device, &allocInfo, descriptorSets.data()) != VK_SUCCESS) {
             throw std::runtime_error("failed to allocate descriptor sets!");
         }
 
diff --git a/code/27_model_loading.cpp b/code/27_model_loading.cpp
@@ -1116,7 +1116,7 @@ class HelloTriangleApplication {
         allocInfo.pSetLayouts = layouts.data();
 
         descriptorSets.resize(swapChainImages.size());
-        if (vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets[0]) != VK_SUCCESS) {
+        if (vkAllocateDescriptorSets(device, &allocInfo, descriptorSets.data()) != VK_SUCCESS) {
             throw std::runtime_error("failed to allocate descriptor sets!");
         }
 
diff --git a/code/28_mipmapping.cpp b/code/28_mipmapping.cpp
@@ -1210,7 +1210,7 @@ class HelloTriangleApplication {
         allocInfo.pSetLayouts = layouts.data();
 
         descriptorSets.resize(swapChainImages.size());
-        if (vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets[0]) != VK_SUCCESS) {
+        if (vkAllocateDescriptorSets(device, &allocInfo, descriptorSets.data()) != VK_SUCCESS) {
             throw std::runtime_error("failed to allocate descriptor sets!");
         }
 
diff --git a/code/29_multisampling.cpp b/code/29_multisampling.cpp
@@ -1269,7 +1269,7 @@ VkSampleCountFlagBits getMaxUsableSampleCount() {
         allocInfo.pSetLayouts = layouts.data();
 
         descriptorSets.resize(swapChainImages.size());
-        if (vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets[0]) != VK_SUCCESS) {
+        if (vkAllocateDescriptorSets(device, &allocInfo, descriptorSets.data()) != VK_SUCCESS) {
             throw std::runtime_error("failed to allocate descriptor sets!");
         }
 

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ std::vector<VkDescriptorSet> descriptorSets;`
`129`	`129`	`...`
`130`	`130`
`131`	`131`	`descriptorSets.resize(swapChainImages.size());`
`132`		`-if (vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets[0]) != VK_SUCCESS) {`
	`132`	`+if (vkAllocateDescriptorSets(device, &allocInfo, descriptorSets.data()) != VK_SUCCESS) {`
`133`	`133`	`throw std::runtime_error("failed to allocate descriptor sets!");`
`134`	`134`	`}`
`135`	`135`	```
Original file line number	Diff line number	Diff line change
`@@ -778,7 +778,7 @@ class HelloTriangleApplication {`
`778`	`778`	`allocInfo.pSetLayouts = layouts.data();`
`779`	`779`
`780`	`780`	`descriptorSets.resize(swapChainImages.size());`
`781`		`- if (vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets[0]) != VK_SUCCESS) {`
	`781`	`+ if (vkAllocateDescriptorSets(device, &allocInfo, descriptorSets.data()) != VK_SUCCESS) {`
`782`	`782`	`throw std::runtime_error("failed to allocate descriptor sets!");`
`783`	`783`	`}`
`784`	`784`
Original file line number	Diff line number	Diff line change
`@@ -923,7 +923,7 @@ class HelloTriangleApplication {`
`923`	`923`	`allocInfo.pSetLayouts = layouts.data();`
`924`	`924`
`925`	`925`	`descriptorSets.resize(swapChainImages.size());`
`926`		`- if (vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets[0]) != VK_SUCCESS) {`
	`926`	`+ if (vkAllocateDescriptorSets(device, &allocInfo, descriptorSets.data()) != VK_SUCCESS) {`
`927`	`927`	`throw std::runtime_error("failed to allocate descriptor sets!");`
`928`	`928`	`}`
`929`	`929`
Original file line number	Diff line number	Diff line change
`@@ -959,7 +959,7 @@ class HelloTriangleApplication {`
`959`	`959`	`allocInfo.pSetLayouts = layouts.data();`
`960`	`960`
`961`	`961`	`descriptorSets.resize(swapChainImages.size());`
`962`		`- if (vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets[0]) != VK_SUCCESS) {`
	`962`	`+ if (vkAllocateDescriptorSets(device, &allocInfo, descriptorSets.data()) != VK_SUCCESS) {`
`963`	`963`	`throw std::runtime_error("failed to allocate descriptor sets!");`
`964`	`964`	`}`
`965`	`965`
Original file line number	Diff line number	Diff line change
`@@ -975,7 +975,7 @@ class HelloTriangleApplication {`
`975`	`975`	`allocInfo.pSetLayouts = layouts.data();`
`976`	`976`
`977`	`977`	`descriptorSets.resize(swapChainImages.size());`
`978`		`- if (vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets[0]) != VK_SUCCESS) {`
	`978`	`+ if (vkAllocateDescriptorSets(device, &allocInfo, descriptorSets.data()) != VK_SUCCESS) {`
`979`	`979`	`throw std::runtime_error("failed to allocate descriptor sets!");`
`980`	`980`	`}`
`981`	`981`
Original file line number	Diff line number	Diff line change
`@@ -1070,7 +1070,7 @@ class HelloTriangleApplication {`
`1070`	`1070`	`allocInfo.pSetLayouts = layouts.data();`
`1071`	`1071`
`1072`	`1072`	`descriptorSets.resize(swapChainImages.size());`
`1073`		`- if (vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets[0]) != VK_SUCCESS) {`
	`1073`	`+ if (vkAllocateDescriptorSets(device, &allocInfo, descriptorSets.data()) != VK_SUCCESS) {`
`1074`	`1074`	`throw std::runtime_error("failed to allocate descriptor sets!");`
`1075`	`1075`	`}`
`1076`	`1076`
Original file line number	Diff line number	Diff line change
`@@ -1116,7 +1116,7 @@ class HelloTriangleApplication {`
`1116`	`1116`	`allocInfo.pSetLayouts = layouts.data();`
`1117`	`1117`
`1118`	`1118`	`descriptorSets.resize(swapChainImages.size());`
`1119`		`- if (vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets[0]) != VK_SUCCESS) {`
	`1119`	`+ if (vkAllocateDescriptorSets(device, &allocInfo, descriptorSets.data()) != VK_SUCCESS) {`
`1120`	`1120`	`throw std::runtime_error("failed to allocate descriptor sets!");`
`1121`	`1121`	`}`
`1122`	`1122`
Original file line number	Diff line number	Diff line change
`@@ -1210,7 +1210,7 @@ class HelloTriangleApplication {`
`1210`	`1210`	`allocInfo.pSetLayouts = layouts.data();`
`1211`	`1211`
`1212`	`1212`	`descriptorSets.resize(swapChainImages.size());`
`1213`		`- if (vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets[0]) != VK_SUCCESS) {`
	`1213`	`+ if (vkAllocateDescriptorSets(device, &allocInfo, descriptorSets.data()) != VK_SUCCESS) {`
`1214`	`1214`	`throw std::runtime_error("failed to allocate descriptor sets!");`
`1215`	`1215`	`}`
`1216`	`1216`
Original file line number	Diff line number	Diff line change
`@@ -1269,7 +1269,7 @@ VkSampleCountFlagBits getMaxUsableSampleCount() {`
`1269`	`1269`	`allocInfo.pSetLayouts = layouts.data();`
`1270`	`1270`
`1271`	`1271`	`descriptorSets.resize(swapChainImages.size());`
`1272`		`- if (vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets[0]) != VK_SUCCESS) {`
	`1272`	`+ if (vkAllocateDescriptorSets(device, &allocInfo, descriptorSets.data()) != VK_SUCCESS) {`
`1273`	`1273`	`throw std::runtime_error("failed to allocate descriptor sets!");`
`1274`	`1274`	`}`
`1275`	`1275`