From edba65bc49fc5903c94b5c97735b0d560e4c8165 Mon Sep 17 00:00:00 2001 From: Nicolas Capens Date: Thu, 20 Oct 2016 14:57:26 -0400 Subject: [PATCH] Remove build dependencies on (LLVM)Reactor. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8c22ec3291f93e2a5baac4067baea73415dfa218 Reviewed-on: https://swiftshader-review.googlesource.com/7758 Reviewed-by: Nicolas Capens Tested-by: Nicolas Capens Reviewed-on: https://swiftshader-review.googlesource.com/8140 Reviewed-by: Alexis Hétu --- SwiftShader.sln | 6 ------ src/Renderer/Renderer.cpp | 18 +++++++++--------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/SwiftShader.sln b/SwiftShader.sln index 352ae6d7bf0..d0501a3168b 100644 --- a/SwiftShader.sln +++ b/SwiftShader.sln @@ -5,9 +5,6 @@ MinimumVisualStudioVersion = 10.0.40219.1 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 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "src\OpenGL\lib 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 diff --git a/src/Renderer/Renderer.cpp b/src/Renderer/Renderer.cpp index b51cbd3e856..d69fcac51ca 100644 --- a/src/Renderer/Renderer.cpp +++ b/src/Renderer/Renderer.cpp @@ -191,15 +191,15 @@ namespace sw } // 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)