Removed some redundant vkCmdBindDescriptorSets calls.

Fixed whitespace a bit
HourglassGame · Jun 20, 2021 · de5a23e · de5a23e
1 parent b1f53e6
commit de5a23e
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 19 deletions.
diff --git a/src/hg/FrontEnd/GameDisplayHelpersVulkan.h b/src/hg/FrontEnd/GameDisplayHelpersVulkan.h
@@ -99,7 +99,7 @@ inline VkPipelineLayoutCreateInfo makePipelineLayoutCreateInfo(
 	VkPipelineLayoutCreateInfo pipelineLayoutInfo = {};
 	pipelineLayoutInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
 	//TODO: Make 2 set layouts: one for projection uniform and one
-	//	  for texture.
+	//      for texture.
 	pipelineLayoutInfo.setLayoutCount = gsl::narrow<uint32_t>(descriptorSetLayouts.size());
 	pipelineLayoutInfo.pSetLayouts = descriptorSetLayouts.data();
 	/*

diff --git a/src/hg/FrontEnd/LoadingLevelScene.cpp b/src/hg/FrontEnd/LoadingLevelScene.cpp
@@ -175,8 +175,6 @@ namespace hg {
 			vkCmdBeginRenderPass(drawCommandBuffer, &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE);
 			vkCmdBindPipeline(drawCommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, sceneData->graphicsPipeline.h());
 
-			vkCmdBindDescriptorSets(drawCommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, sceneData->pipelineLayout.pipelineLayout, 1, 1, &sceneData->fontTexDescriptorSet, 0, nullptr);
-
 			reallyDoRender(preDrawCommandBuffer, drawCommandBuffer, target, targetFrameBuffer);
 
 			vkCmdEndRenderPass(drawCommandBuffer);

diff --git a/src/hg/FrontEnd/MainMenuScene.cpp b/src/hg/FrontEnd/MainMenuScene.cpp
@@ -359,8 +359,6 @@ class MainMenuSceneRenderer : public SceneRenderer {
 		vkCmdBeginRenderPass(drawCommandBuffer, &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE);
 		vkCmdBindPipeline(drawCommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, sceneData->graphicsPipeline.h());
 
-		vkCmdBindDescriptorSets(drawCommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, sceneData->pipelineLayout.pipelineLayout, 1, 1, &sceneData->fontTexDescriptorSet, 0, nullptr);
-
 		reallyDoRender(preDrawCommandBuffer, drawCommandBuffer, target, targetFrameBuffer);
 
 		vkCmdEndRenderPass(drawCommandBuffer);
@@ -387,11 +385,11 @@ class MainMenuSceneRenderer : public SceneRenderer {
 
 			target.updateUniformBuffer(
 				UniformBufferObject{
-					//Out  x	y	z	v
-						   a, 0.0, 0.0, 0.0,//In x
-						 0.0,   b, 0.0, 0.0,//In y
-						 0.0, 0.0, 1.0, 0.0,//In z
-						   c,   d, 0.0, 1.0 //In v
+					//Out  x    y    z    v
+					       a, 0.0, 0.0, 0.0,//In x
+					     0.0,   b, 0.0, 0.0,//In y
+					     0.0, 0.0, 1.0, 0.0,//In z
+					       c,   d, 0.0, 1.0 //In v
 				}
 			);
 		}

diff --git a/src/hg/FrontEnd/PostLevelSceneRenderer.h b/src/hg/FrontEnd/PostLevelSceneRenderer.h
@@ -230,8 +230,6 @@ class PostLevelSceneRenderer : public SceneRenderer {
 			vkCmdBeginRenderPass(drawCommandBuffer, &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE);
 			vkCmdBindPipeline(drawCommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, sceneData->graphicsPipeline.h());
 
-			vkCmdBindDescriptorSets(drawCommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, sceneData->pipelineLayout.pipelineLayout, 1, 1, &sceneData->textures.fontTexDescriptorSet, 0, nullptr);
-
 			reallyDoRender(preDrawCommandBuffer, drawCommandBuffer, target, targetFrameBuffer, timelineTexture);
 
 			vkCmdEndRenderPass(drawCommandBuffer);

diff --git a/src/hg/FrontEnd/RunningGameSceneRenderer.h b/src/hg/FrontEnd/RunningGameSceneRenderer.h
@@ -266,8 +266,6 @@ namespace hg {
 			vkCmdBeginRenderPass(drawCommandBuffer, &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE);
 			vkCmdBindPipeline(drawCommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, sceneData->graphicsPipeline.h());
 
-			vkCmdBindDescriptorSets(drawCommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, sceneData->pipelineLayout.pipelineLayout, 1, 1, &sceneData->textures.fontTexDescriptorSet, 0, nullptr);
-
 			reallyDoRender(preDrawCommandBuffer, drawCommandBuffer, target, targetFrameBuffer, timelineTexture);
 
 			vkCmdEndRenderPass(drawCommandBuffer);

diff --git a/src/hg/FrontEnd/RuntimeErrorScene.cpp b/src/hg/FrontEnd/RuntimeErrorScene.cpp
@@ -172,8 +172,6 @@ class RuntimeErrorSceneRenderer : public SceneRenderer {
 		vkCmdBeginRenderPass(drawCommandBuffer, &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE);
 		vkCmdBindPipeline(drawCommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, sceneData->graphicsPipeline.h());
 
-		vkCmdBindDescriptorSets(drawCommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, sceneData->pipelineLayout.pipelineLayout, 1, 1, &sceneData->fontTexDescriptorSet, 0, nullptr);
-
 		reallyDoRender(preDrawCommandBuffer, drawCommandBuffer, target, targetFrameBuffer);
 
 		vkCmdEndRenderPass(drawCommandBuffer);

diff --git a/src/hg/FrontEnd/SelectionScene.cpp b/src/hg/FrontEnd/SelectionScene.cpp
@@ -177,8 +177,6 @@ namespace hg {
 			vkCmdBeginRenderPass(drawCommandBuffer, &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE);
 			vkCmdBindPipeline(drawCommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, sceneData->graphicsPipeline.h());
 
-			vkCmdBindDescriptorSets(drawCommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, sceneData->pipelineLayout.pipelineLayout, 1, 1, &sceneData->fontTexDescriptorSet, 0, nullptr);
-
 			reallyDoRender(preDrawCommandBuffer, drawCommandBuffer, target, targetFrameBuffer);
 
 			vkCmdEndRenderPass(drawCommandBuffer);

diff --git a/src/hg/FrontEnd/VulkanRenderTarget.h b/src/hg/FrontEnd/VulkanRenderTarget.h
@@ -486,7 +486,6 @@ struct VulkanRenderTarget {
 
 		uniformBuffers.back().descriptorSets.push_back(descriptorSet);
 
-		//vkCmdBindDescriptorSets
 		vkCmdBindDescriptorSets(drawCommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayout, 0, 1, &descriptorSet, 0, nullptr);
 	}
 	void newFrame() {