Kill HAVE_OPENCL.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6756 8ced0084-cf51-0410-be5f-012b33b47a6e

3 files changed, 3 insertions, 46 deletions

diff --git a/Source/Core/Common/Src/OpenCL.cpp b/Source/Core/Common/Src/OpenCL.cpp
index c3d3f7e796..d1658ae486 100644
--- a/Source/Core/Common/Src/OpenCL.cpp
+++ b/Source/Core/Common/Src/OpenCL.cpp
@@ -21,18 +21,12 @@
 #include "Common.h"
 #include "Timer.h"
 
-#ifndef __APPLE__
-#include "clrun.h"
-#endif
-
 namespace OpenCL
 {
 
-#if defined(HAVE_OPENCL) && HAVE_OPENCL
 cl_device_id device_id = NULL;
 cl_context g_context = NULL;
 cl_command_queue g_cmdq = NULL;
-#endif
 
 bool g_bInitialized = false;
 
@@ -41,7 +35,6 @@ bool Initialize()
 	if(g_bInitialized)
 		return true;
 
-#if defined(HAVE_OPENCL) && HAVE_OPENCL
 	if(g_context)
 		return false;
 	int err;			// error code returned from api calls
@@ -127,12 +120,8 @@ bool Initialize()
 
 	g_bInitialized = true;
 	return true;
-#else
-	return false;
-#endif
 }
 
-#if defined(HAVE_OPENCL) && HAVE_OPENCL
 cl_context GetContext()
 {
 	return g_context;
@@ -204,11 +193,9 @@ cl_kernel CompileKernel(cl_program program, const char *Function)
 		(float)(Common::Timer::GetTimeMs() - compileStart) / 1000.0);
 	return kernel;
 }
-#endif
 
 void Destroy()
 {
-#if defined(HAVE_OPENCL) && HAVE_OPENCL
 	if (g_cmdq)
 	{
 		clReleaseCommandQueue(g_cmdq);
@@ -220,13 +207,10 @@ void Destroy()
 		g_context = NULL;
 	}		
 	g_bInitialized = false;
-#endif
 }
 
 void HandleCLError(cl_int error, const char* str)
 {
-#if defined(HAVE_OPENCL) && HAVE_OPENCL
-
 	const char* name;
 	switch(error)
 	{
@@ -284,6 +268,5 @@ void HandleCLError(cl_int error, const char* str)
 	if(!str)
 		str = "";
 	ERROR_LOG(COMMON, "OpenCL error: %s %s (%d)", str, name, error);
-#endif
 	}
 }
diff --git a/Source/Core/Common/Src/OpenCL.h b/Source/Core/Common/Src/OpenCL.h
index 411a1697be..f299e9ff1e 100644
--- a/Source/Core/Common/Src/OpenCL.h
+++ b/Source/Core/Common/Src/OpenCL.h
@@ -20,46 +20,21 @@
 
 #include "Common.h"
 
-// The CLRun library provides the headers and all the imports
-#ifndef __APPLE__
-#define HAVE_OPENCL 1
-#endif
-
-// We detect the presence of the 10.6 SDK, which has the OpenCL headers,
-// by looking for the new blocks feature in the 10.6 version of gcc.
-// This allows us to have the 10.5 SDK first in the search path.
-#if defined __APPLE__ && defined __BLOCKS__
-#define AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER WEAK_IMPORT_ATTRIBUTE
-#define HAVE_OPENCL 1
-#endif
-
-#if defined(HAVE_OPENCL) && HAVE_OPENCL
-
 #ifdef __APPLE__
+#define AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER WEAK_IMPORT_ATTRIBUTE
 #include <OpenCL/cl.h>
 #else
+// The CLRun library provides the headers and all the imports.
 #include <CL/cl.h>
-#endif
-
-#else
-
-typedef void *cl_context;
-typedef void *cl_command_queue;
-typedef void *cl_program;
-typedef void *cl_kernel;
-typedef void *cl_mem;
-typedef void *cl_int;
-
+#include <clrun.h>
 #endif
 
 namespace OpenCL
 {
 
-#if defined(HAVE_OPENCL) && HAVE_OPENCL
 extern cl_device_id device_id;
 extern cl_context g_context;
 extern cl_command_queue g_cmdq;
-#endif
 
 bool Initialize();
 
diff --git a/Source/Core/Common/Src/SConscript b/Source/Core/Common/Src/SConscript
index 8c5ca2d832..34dcec56bb 100644
--- a/Source/Core/Common/Src/SConscript
+++ b/Source/Core/Common/Src/SConscript
@@ -5,7 +5,6 @@ import os
 import sys
 from SconsTests import utils
 
-Execute(Delete(File('#Source/Core/Common/Src/svnrev.h').abspath))
 utils.GenerateRevFile(env['flavor'], Dir('#Source/Core/Common/Src').abspath +
     os.sep + 'svnrev_template.h', 'svnrev.h')