From 21fb4cb96c7503068b95936b311cef55f818870b Mon Sep 17 00:00:00 2001 From: xsacha Date: Tue, 22 Jun 2010 13:17:01 +0000 Subject: Add a toggle option for OpenCL in Config (in Advanced Settings). Default is off. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5768 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/VideoCommon/Src/TextureDecoder.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Source/Core/VideoCommon/Src/TextureDecoder.cpp') diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.cpp b/Source/Core/VideoCommon/Src/TextureDecoder.cpp index ae41f822c2..509def5a74 100644 --- a/Source/Core/VideoCommon/Src/TextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/TextureDecoder.cpp @@ -32,6 +32,7 @@ #include "OpenCL.h" #if defined(HAVE_OPENCL) && HAVE_OPENCL #include "OpenCL/OCLTextureDecoder.h" +#include "VideoConfig.h" #endif #include "LookUpTables.h" @@ -1269,7 +1270,8 @@ PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, in PC_TexFormat retval = PC_TEX_FMT_NONE; #if defined(HAVE_OPENCL) && HAVE_OPENCL - retval = TexDecoder_Decode_OpenCL(dst, src, width, height, texformat, tlutaddr, tlutfmt, rgbaOnly); + if (g_Config.bEnableOpenCL) + retval = TexDecoder_Decode_OpenCL(dst, src, width, height, texformat, tlutaddr, tlutfmt, rgbaOnly); #endif if(retval == PC_TEX_FMT_NONE) -- cgit v1.2.3