commit edba65bc49fc5903c94b5c97735b0d560e4c8165
author Nicolas Capens <capn@google.com> Thu Oct 20 14:57:26 2016 -0400
committer Nicolas Capens <capn@google.com> Thu Dec 01 17:14:42 2016 +0000
tree 3244e372609196e18597484cf234c01e4594d9f8
parent 363b61e7244c6912b1beafd228901a0fd860e8da

Remove build dependencies on (LLVM)Reactor.

Change-Id: I8c22ec3291f93e2a5baac4067baea73415dfa218
Reviewed-on: https://swiftshader-review.googlesource.com/7758
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-on: https://swiftshader-review.googlesource.com/8140
Reviewed-by: Alexis Hétu <sugoi@google.com>

SwiftShader.sln

diff --git a/SwiftShader.sln b/SwiftShader.sln
index 352ae6d..d0501a3 100644
--- a/SwiftShader.sln
+++ b/SwiftShader.sln
@@ -5,9 +5,6 @@
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LLVM", "LLVM", "{B408B98A-E888-4ECF-81E0-7A37A6854B17}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SwiftShader", "src\SwiftShader\SwiftShader.vcxproj", "{7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}"

-	ProjectSection(ProjectDependencies) = postProject

-		{28FD076D-10B5-4BD8-A4CF-F44C7002A803} = {28FD076D-10B5-4BD8-A4CF-F44C7002A803}

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Reactor", "src\Reactor\Reactor.vcxproj", "{28FD076D-10B5-4BD8-A4CF-F44C7002A803}"

 EndProject

@@ -22,9 +19,6 @@
 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "src\OpenGL\libEGL\libEGL.vcxproj", "{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}"

-	ProjectSection(ProjectDependencies) = postProject

-		{7B02CB19-4CDF-4F79-BC9B-7F3F6164A003} = {7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLVMAnalysis", "third_party\LLVM\lib\Analysis\LLVMAnalysis.vcxproj", "{97EDF19C-6360-4770-9255-EBA2F1A13E9B}"

 	ProjectSection(ProjectDependencies) = postProject

src/Renderer/Renderer.cpp

diff --git a/src/Renderer/Renderer.cpp b/src/Renderer/Renderer.cpp
index b51cbd3..d69fcac 100644
--- a/src/Renderer/Renderer.cpp
+++ b/src/Renderer/Renderer.cpp
@@ -191,15 +191,15 @@
 	}
 
 	// This object has to be mem aligned
-	void* Renderer::operator new(size_t size)

-	{

-		ASSERT(size == sizeof(Renderer)); // This operator can't be called from a derived class

-		return sw::allocate(sizeof(Renderer), 16);

-	}

-

-	void Renderer::operator delete(void * mem)

-	{

-		sw::deallocate(mem);

+	void* Renderer::operator new(size_t size)
+	{
+		ASSERT(size == sizeof(Renderer)); // This operator can't be called from a derived class
+		return sw::allocate(sizeof(Renderer), 16);
+	}
+
+	void Renderer::operator delete(void * mem)
+	{
+		sw::deallocate(mem);
 	}
 
 	void Renderer::clear(void *pixel, Format format, Surface *dest, const SliceRect &dRect, unsigned int rgbaMask)