From afde90dcfd8255b2b0fd5371b8001f5187aca5c1 Mon Sep 17 00:00:00 2001
From: Sascha Willems <webmaster@saschawillems.de>
Date: Sun, 21 Jan 2024 13:19:40 +0100
Subject: [PATCH] Code cleanup

---
 examples/computecullandlod/computecullandlod.cpp   | 4 ++--
 examples/descriptorindexing/descriptorindexing.cpp | 4 ++--
 examples/pushdescriptors/pushdescriptors.cpp       | 7 +++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/examples/computecullandlod/computecullandlod.cpp b/examples/computecullandlod/computecullandlod.cpp
index a697e1f6..dac6ce1f 100644
--- a/examples/computecullandlod/computecullandlod.cpp
+++ b/examples/computecullandlod/computecullandlod.cpp
@@ -335,7 +335,7 @@ public:
 		vkEndCommandBuffer(compute.commandBuffer);
 	}
 
-	void setupDescriptorSets()
+	void setupDescriptors()
 	{
 		// Pool
 		std::vector<VkDescriptorPoolSize> poolSizes = {
@@ -744,7 +744,7 @@ public:
 		VulkanExampleBase::prepare();
 		loadAssets();
 		prepareBuffers();
-		setupDescriptorSets();
+		setupDescriptors();
 		preparePipelines();
 		prepareCompute();
 		buildCommandBuffers();
diff --git a/examples/descriptorindexing/descriptorindexing.cpp b/examples/descriptorindexing/descriptorindexing.cpp
index 83e5879c..d457a114 100644
--- a/examples/descriptorindexing/descriptorindexing.cpp
+++ b/examples/descriptorindexing/descriptorindexing.cpp
@@ -205,7 +205,7 @@ public:
 	}
 
 	// [POI] Set up descriptor sets and set layout
-	void setupDescriptorSets()
+	void setupDescriptors()
 	{
 		// Descriptor pool
 		std::vector<VkDescriptorPoolSize> poolSizes = {
@@ -403,7 +403,7 @@ public:
 		generateTextures();
 		generateCubes();
 		prepareUniformBuffers();
-		setupDescriptorSets();
+		setupDescriptors();
 		preparePipelines();
 		buildCommandBuffers();
 		prepared = true;
diff --git a/examples/pushdescriptors/pushdescriptors.cpp b/examples/pushdescriptors/pushdescriptors.cpp
index de587756..da2c3e2c 100644
--- a/examples/pushdescriptors/pushdescriptors.cpp
+++ b/examples/pushdescriptors/pushdescriptors.cpp
@@ -181,12 +181,15 @@ public:
 		descriptorLayoutCI.pBindings = setLayoutBindings.data();
 		VK_CHECK_RESULT(vkCreateDescriptorSetLayout(device, &descriptorLayoutCI, nullptr, &descriptorSetLayout));
 
-		VkPipelineLayoutCreateInfo pipelineLayoutCI = vks::initializers::pipelineLayoutCreateInfo(&descriptorSetLayout, 1);
-		VK_CHECK_RESULT(vkCreatePipelineLayout(device, &pipelineLayoutCI, nullptr, &pipelineLayout));
 	}
 
 	void preparePipelines()
 	{
+		// Layout
+		VkPipelineLayoutCreateInfo pipelineLayoutCI = vks::initializers::pipelineLayoutCreateInfo(&descriptorSetLayout, 1);
+		VK_CHECK_RESULT(vkCreatePipelineLayout(device, &pipelineLayoutCI, nullptr, &pipelineLayout));
+
+		// Pipeline
 		VkPipelineInputAssemblyStateCreateInfo inputAssemblyStateCI = vks::initializers::pipelineInputAssemblyStateCreateInfo(VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, 0, VK_FALSE);
 		VkPipelineRasterizationStateCreateInfo rasterizationStateCI = vks::initializers::pipelineRasterizationStateCreateInfo(VK_POLYGON_MODE_FILL, VK_CULL_MODE_BACK_BIT, VK_FRONT_FACE_COUNTER_CLOCKWISE, 0);
 		VkPipelineColorBlendAttachmentState blendAttachmentState = vks::initializers::pipelineColorBlendAttachmentState(0xf, VK_FALSE);