src/Pipeline/ComputeProgram: Remove unused parameter numDescriptorSets

Change-Id: I1881916302d6652144138106d0744e9bbd2b45c8 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/27008 Presubmit-Ready: Ben Clayton <bclayton@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Tested-by: Ben Clayton <bclayton@google.com>

src/Pipeline/ComputeProgram: Remove unused parameter numDescriptorSets
1407297b · Ben Clayton · dd2faaee · 1407297b · 1407297b · 1407297b
Commit 1407297b authored Mar 12, 2019 by Ben Clayton
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

ComputeProgram.cpp src/Pipeline/ComputeProgram.cpp +1 -2

ComputeProgram.hpp src/Pipeline/ComputeProgram.hpp +1 -2

VkPipeline.cpp src/Vulkan/VkPipeline.cpp +1 -2

No files found.
--- a/src/Pipeline/ComputeProgram.cpp
+++ b/src/Pipeline/ComputeProgram.cpp
@@ -137,8 +137,7 @@ namespace sw
 	}
 	void ComputeProgram::run(
-		Routine *routine,
+		Routine *routine, void** descriptorSets,
-		uint32_t numDescriptorSets, void** descriptorSets,
 		uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ)
 	{
 		auto runWorkgroup = (void(*)(void*))(routine->getEntry());

--- a/src/Pipeline/ComputeProgram.hpp
+++ b/src/Pipeline/ComputeProgram.hpp
@@ -47,8 +47,7 @@ namespace sw
 		// run executes the compute shader routine for all workgroups.
 		// TODO(bclayton): This probably does not belong here. Consider moving.
 		static void run(
-			Routine *routine,
+			Routine *routine, void** descriptorSets,
-			uint32_t numDescriptorSets, void** descriptorSets,
 			uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ);
 	protected:

--- a/src/Vulkan/VkPipeline.cpp
+++ b/src/Vulkan/VkPipeline.cpp
@@ -573,8 +573,7 @@ void ComputePipeline::run(uint32_t groupCountX, uint32_t groupCountY, uint32_t g
 {
 	ASSERT_OR_RETURN(routine != nullptr);
 	sw::ComputeProgram::run(
-		routine,
+		routine, reinterpret_cast<void**>(descriptorSets),
-		numDescriptorSets, reinterpret_cast<void**>(descriptorSets),
 		groupCountX, groupCountY, groupCountZ);
 }