Replace sw::Resource with sw::WaitGroup

sw::Resource is only used by the Renderer class and the
functionality used is simply one of a WaitGroup. The sync
variables has been changed from a Resource to a WaitGroup
and the Resource class has been removed.

Bug b/133127573

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

Author: sugoi1

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8)
 
 project(SwiftShader C CXX)
 
@@ -1653,8 +1653,6 @@ file(GLOB_RECURSE VULKAN_LIST
     ${SOURCE_DIR}/System/Math.hpp
     ${SOURCE_DIR}/System/Memory.cpp
     ${SOURCE_DIR}/System/Memory.hpp
-    ${SOURCE_DIR}/System/Resource.cpp
-    ${SOURCE_DIR}/System/Resource.hpp
     ${SOURCE_DIR}/System/Socket.cpp
     ${SOURCE_DIR}/System/Socket.hpp
     ${SOURCE_DIR}/System/Synchronization.hpp

src/Android.bp

@@ -652,7 +652,6 @@ cc_defaults {
         "System/Half.cpp",
         "System/Math.cpp",
         "System/Memory.cpp",
-        "System/Resource.cpp",
         "System/Socket.cpp",
         "System/Timer.cpp",
         "System/DebugAndroid.cpp",

src/Device/Renderer.cpp

@@ -22,7 +22,6 @@
 #include "Pipeline/Constants.hpp"
 #include "System/CPUID.hpp"
 #include "System/Memory.hpp"
-#include "System/Resource.hpp"
 #include "System/Half.hpp"
 #include "System/Math.hpp"
 #include "System/Timer.hpp"
@@ -249,16 +248,12 @@ namespace sw
 
 		swiftConfig = new SwiftConfig(disableServer);
 		updateConfiguration(true);
-
-		sync = new Resource(0);
 	}
 
 	Renderer::~Renderer()
 	{
-		sync->lock(EXCLUSIVE);
-		sync->destruct();
+		sync.wait();
 		terminateThreads();
-		sync->unlock();
 
 		delete resumeApp;
 		resumeApp = nullptr;
@@ -318,7 +313,7 @@ namespace sw
 			return;
 		}
 
-		sync->lock(sw::PRIVATE);
+		sync.add();
 
 		if(update)
 		{
@@ -810,8 +805,7 @@ namespace sw
 
 	void Renderer::synchronize()
 	{
-		sync->lock(sw::PUBLIC);
-		sync->unlock();
+		sync.wait();
 	}
 
 	void Renderer::finishRendering(Task &pixelTask)
@@ -884,7 +878,7 @@ namespace sw
 					draw.events = nullptr;
 				}
 
-				sync->unlock();
+				sync.done();
 
 				draw.references = -1;
 				resumeApp->signal();

src/Device/Renderer.hpp

@@ -300,7 +300,7 @@ namespace sw
 		SwiftConfig *swiftConfig;
 
 		std::list<vk::Query*> queries;
-		Resource *sync;
+		WaitGroup sync;
 
 		VertexProcessor::State vertexState;
 		SetupProcessor::State setupState;

src/System/BUILD.gn

@@ -28,8 +28,6 @@ swiftshader_source_set("System") {
     "Math.hpp",
     "Memory.cpp",
     "Memory.hpp",
-    "Resource.cpp",
-    "Resource.hpp",
     "Socket.cpp",
     "Socket.hpp",
     "Thread.hpp",

src/System/Resource.cpp

@@ -178,7 +178,6 @@ IF EXIST "$(SolutionDir)..\deqp\build\external\vulkancts\modules\vulkan\" (copy
     <ClCompile Include="..\System\Half.cpp" />
     <ClCompile Include="..\System\Math.cpp" />
     <ClCompile Include="..\System\Memory.cpp" />
-    <ClCompile Include="..\System\Resource.cpp" />
     <ClCompile Include="..\System\Socket.cpp" />
     <ClCompile Include="..\System\Timer.cpp" />
     <ClCompile Include="..\WSI\VkSurfaceKHR.cpp" />
@@ -274,7 +273,6 @@ IF EXIST "$(SolutionDir)..\deqp\build\external\vulkancts\modules\vulkan\" (copy
     <ClInclude Include="..\System\Half.hpp" />
     <ClInclude Include="..\System\Math.hpp" />
     <ClInclude Include="..\System\Memory.hpp" />
-    <ClInclude Include="..\System\Resource.hpp" />
     <ClInclude Include="..\System\SharedLibrary.hpp" />
     <ClInclude Include="..\System\Socket.hpp" />
     <ClInclude Include="..\System\Synchronization.hpp" />

src/System/Resource.hpp

@@ -150,9 +150,6 @@
     <ClCompile Include="..\System\Memory.cpp">
       <Filter>Source Files\System</Filter>
     </ClCompile>
-    <ClCompile Include="..\System\Resource.cpp">
-      <Filter>Source Files\System</Filter>
-    </ClCompile>
     <ClCompile Include="..\System\Socket.cpp">
       <Filter>Source Files\System</Filter>
     </ClCompile>
@@ -488,9 +485,6 @@
     <ClInclude Include="..\System\Memory.hpp">
       <Filter>Header Files\System</Filter>
     </ClInclude>
-    <ClInclude Include="..\System\Resource.hpp">
-      <Filter>Header Files\System</Filter>
-    </ClInclude>
     <ClInclude Include="..\System\SharedLibrary.hpp">
       <Filter>Header Files\System</Filter>
     </ClInclude>