commit bd0ab1be59a1a4dce3455a8855af5bc942b875bb
author Ben Clayton <bclayton@google.com> Mon May 20 11:20:28 2019 +0100
committer Ben Clayton <bclayton@google.com> Thu May 23 17:09:03 2019 +0000
tree a7c3c2e616c9ad3d41ba89b9b64de3509e1d216c
parent 6d33e8c3c5b72ffe1a2cdc6f5f110bd6301548d4

Pass around sw::TaskEvents* instead of vk::Fence*.

Bug: b/133127573
Change-Id: I0ce0164de401524014eb295547b899f24f437e21
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/31683
Tested-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

src/Vulkan/VkQueue.cpp

diff --git a/src/Vulkan/VkQueue.cpp b/src/Vulkan/VkQueue.cpp
index de19f0e..73e3602 100644
--- a/src/Vulkan/VkQueue.cpp
+++ b/src/Vulkan/VkQueue.cpp
@@ -102,11 +102,11 @@
 	Task task;
 	task.submitCount = submitCount;
 	task.pSubmits = DeepCopySubmitInfo(submitCount, pSubmits);
-	task.fence = (fence != VK_NULL_HANDLE) ? vk::Cast(fence) : nullptr;
+	task.events = (fence != VK_NULL_HANDLE) ? vk::Cast(fence) : nullptr;
 
-	if(task.fence)
+	if(task.events)
 	{
-		task.fence->start();
+		task.events->start();
 	}
 
 	pending.put(task);
@@ -132,7 +132,7 @@
 		{
 			CommandBuffer::ExecutionState executionState;
 			executionState.renderer = renderer.get();
-			executionState.fence = task.fence;
+			executionState.events = task.events;
 			for(uint32_t j = 0; j < submitInfo.commandBufferCount; j++)
 			{
 				vk::Cast(submitInfo.pCommandBuffers[j])->submit(executionState);
@@ -150,12 +150,12 @@
 		toDelete.put(task.pSubmits);
 	}
 
-	if(task.fence)
+	if(task.events)
 	{
 		// TODO: fix renderer signaling so that work submitted separately from (but before) a fence
 		// is guaranteed complete by the time the fence signals.
 		renderer->synchronize();
-		task.fence->finish();
+		task.events->finish();
 	}
 }
 
@@ -187,7 +187,7 @@
 	fence.start();
 
 	Task task;
-	task.fence = &fence;
+	task.events = &fence;
 	pending.put(task);
 
 	fence.wait();