diff options
| author | xsacha <xsacha@gmail.com> | 2010-06-22 13:17:01 +0000 |
|---|---|---|
| committer | xsacha <xsacha@gmail.com> | 2010-06-22 13:17:01 +0000 |
| commit | 21fb4cb96c7503068b95936b311cef55f818870b (patch) | |
| tree | 54615ce36ca9666fa8b56c1056cf8875dd32b98e /Source/Core/VideoCommon/Src/TextureDecoder.cpp | |
| parent | 25aca8cc4a7bfa764d1381dd57fd6e75d7039c26 (diff) | |
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
Diffstat (limited to 'Source/Core/VideoCommon/Src/TextureDecoder.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/TextureDecoder.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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) |