commit 1407297b7f7d5ca4730d6ab46ec78c14d1ebb36d
author Ben Clayton <bclayton@google.com> Tue Mar 12 15:58:02 2019 +0000
committer Ben Clayton <bclayton@google.com> Wed Mar 13 07:29:31 2019 +0000
tree ba5ce7f0ce2285e8fd3fa3c871cc5caec0b3d195
parent dd2faaeee6b24049ae45541e959dddc7ff380a0f

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.cpp

diff --git a/src/Pipeline/ComputeProgram.cpp b/src/Pipeline/ComputeProgram.cpp
index 2892ed7..fd309c8 100644
--- a/src/Pipeline/ComputeProgram.cpp
+++ b/src/Pipeline/ComputeProgram.cpp
@@ -137,8 +137,7 @@
 	}
 
 	void ComputeProgram::run(
-		Routine *routine,
-		uint32_t numDescriptorSets, void** descriptorSets,
+		Routine *routine, void** descriptorSets,
 		uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ)
 	{
 		auto runWorkgroup = (void(*)(void*))(routine->getEntry());

src/Pipeline/ComputeProgram.hpp

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

src/Vulkan/VkPipeline.cpp

diff --git a/src/Vulkan/VkPipeline.cpp b/src/Vulkan/VkPipeline.cpp
index 0b5f0c8..e567e8d 100644
--- a/src/Vulkan/VkPipeline.cpp
+++ b/src/Vulkan/VkPipeline.cpp
@@ -573,8 +573,7 @@
 {
 	ASSERT_OR_RETURN(routine != nullptr);
 	sw::ComputeProgram::run(
-		routine,
-		numDescriptorSets, reinterpret_cast<void**>(descriptorSets),
+		routine, reinterpret_cast<void**>(descriptorSets),
 		groupCountX, groupCountY, groupCountZ);
 }