piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add a toggle option for OpenCL in Config (in Advanced Settings). Default is off.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5768 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
xsacha
2010-06-22 13:17:01 +00:00
parent 25aca8cc4a
commit 21fb4cb96c
8 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/VideoCommon/Src/OpcodeDecoding.cpp
View File

@ -45,6 +45,7 @@
#include "OpenCL.h"
#if defined(HAVE_OPENCL) && HAVE_OPENCL
#include "OpenCL/OCLTextureDecoder.h"
#include "VideoConfig.h"
#endif
u8* g_pVideoData = 0;
@ -385,8 +386,11 @@ void OpcodeDecoder_Init()
g_pVideoData = FAKE_GetFifoStartPtr();
#if defined(HAVE_OPENCL) && HAVE_OPENCL
OpenCL::Initialize();
TexDecoder_OpenCL_Initialize();
if (g_Config.bEnableOpenCL)
{
OpenCL::Initialize();
TexDecoder_OpenCL_Initialize();
}
#endif
}
@ -394,8 +398,11 @@ void OpcodeDecoder_Init()
void OpcodeDecoder_Shutdown()
{
#if defined(HAVE_OPENCL) && HAVE_OPENCL
TexDecoder_OpenCL_Shutdown();
OpenCL::Destroy();
if (g_Config.bEnableOpenCL)
{
TexDecoder_OpenCL_Shutdown();
OpenCL::Destroy();
}
#endif
}

4
Source/Core/VideoCommon/Src/TextureDecoder.cpp
View File

@ -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)

1
Source/Core/VideoCommon/Src/VideoConfig.cpp
View File

@ -107,6 +107,7 @@ void VideoConfig::Load(const char *ini_file)
bool bTmp;
iniFile.Get("Interface", "UsePanicHandlers", &bTmp, true);
SetEnableAlert(bTmp);
iniFile.Get("Core", "EnableOpenCL", &bEnableOpenCL, false);
}
void VideoConfig::GameIniLoad(const char *ini_file)

3
Source/Core/VideoCommon/Src/VideoConfig.h
View File

@ -77,6 +77,9 @@ struct VideoConfig
bool bUseRealXFB;
bool bAutoScale; // Removes annoying borders without using XFB. Doesn't always work perfectly.
bool bUseNativeMips;
// OpenCL
bool bEnableOpenCL;
// Enhancements
int iMultisampleMode;