diff options
| author | XTra.KrazzY <XTra.KrazzY@gmail.com> | 2009-09-30 12:58:02 +0000 |
|---|---|---|
| committer | XTra.KrazzY <XTra.KrazzY@gmail.com> | 2009-09-30 12:58:02 +0000 |
| commit | 4499444a861b1eb7c342e08ea1bdc9e6921f5e59 (patch) | |
| tree | 79951a1a509394cabf7709e6d4418e58e33a335b /Source/Core/VideoCommon/Src/TextureDecoder.cpp | |
| parent | ffe12ec752566be042767b805f24c204e7428fc6 (diff) | |
OpenGL and OpenCL are NOT related! (Committed here are some scons fixes)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4349 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon/Src/TextureDecoder.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/TextureDecoder.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.cpp b/Source/Core/VideoCommon/Src/TextureDecoder.cpp index ed15472433..ead79400ca 100644 --- a/Source/Core/VideoCommon/Src/TextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/TextureDecoder.cpp @@ -21,7 +21,7 @@ #include "CPUDetect.h" #include "TextureDecoder.h" -#ifdef HAVE_OPENCL +#if defined(HAVE_OPENCL) && HAVE_OPENCL #include "OpenCL/TextureDecoder.h" #endif @@ -581,11 +581,11 @@ void TexDecoder_SetTexFmtOverlayOptions(bool enable, bool center) PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt) { - #ifdef HAVE_OPENCL +#if defined(HAVE_OPENCL) && HAVE_OPENCL PC_TexFormat retval = TexDecoder_Decode_OpenCL(dst, src, width, height, texformat, tlutaddr, tlutfmt); - #else +#else PC_TexFormat retval = TexDecoder_Decode_real(dst,src,width,height,texformat,tlutaddr,tlutfmt); - #endif +#endif if ((!TexFmt_Overlay_Enable)|| (retval == PC_TEX_FMT_NONE)) return retval; |