From c2f84fdccb1106bbd0ab2b640aefaf413d03871d Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Sun, 5 Dec 2010 16:57:32 +0000 Subject: CLRun is now used everywhere but OS X. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6532 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/OpenCL.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Source/Core/Common/Src/OpenCL.cpp') diff --git a/Source/Core/Common/Src/OpenCL.cpp b/Source/Core/Common/Src/OpenCL.cpp index c1a6e7166b..2b3b309794 100644 --- a/Source/Core/Common/Src/OpenCL.cpp +++ b/Source/Core/Common/Src/OpenCL.cpp @@ -21,7 +21,7 @@ #include "Common.h" #include "Timer.h" -#if defined(_WIN32) || defined(USE_CLRUN) +#ifndef __APPLE__ #include "clrun.h" #endif @@ -46,14 +46,15 @@ bool Initialize() return false; int err; // error code returned from api calls -#if defined(_WIN32) || defined(USE_CLRUN) +#ifdef __APPLE__ + // If OpenCL is weakly linked and not found, its symbols will be NULL + if (clGetPlatformIDs == NULL) + return false; +#else clrInit(); if(!clrHasOpenCL()) return false; #endif - // If OpenCL is weakly linked and not found, its symbols will be NULL - if (clGetPlatformIDs == NULL) - return false; // Connect to a compute device cl_uint numPlatforms; -- cgit v1.2.3