libretro/pcsx2
1
0
Fork 0
mirror of https://github.com/libretro/pcsx2.git synced 2025-01-23 01:54:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #405 from PCSX2/disable-opencl

Browse Source 
gsdx ocl: disable it on windows
This commit is contained in:
Gregory Hainaut 2014-12-23 19:48:50 +01:00
commit c5b6216032
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/GSdx/GS.cpp
View File

@ -267,9 +267,13 @@ static int _GSopen(void** dsp, char* title, int renderer, int threads = -1)
case 14: case 15: case 16: case 17:
#ifdef ENABLE_OPENCL
s_gs = new GSRendererCL();
#else
printf("GSdx error: opencl is disabled\n");
#endif
break;
}
if (s_gs == NULL)
return -1;
s_renderer = renderer;
}

2
plugins/GSdx/GSSettingsDlg.cpp
View File

@ -31,6 +31,7 @@ GSSettingsDlg::GSSettingsDlg(bool isOpen2)
: GSDialog(isOpen2 ? IDD_CONFIG2 : IDD_CONFIG)
, m_IsOpen2(isOpen2)
{
#ifdef ENABLE_OPENCL
list<OCLDeviceDesc> ocldevs;
GSUtil::GetDeviceDescs(ocldevs);
@ -41,6 +42,7 @@ GSSettingsDlg::GSSettingsDlg(bool isOpen2)
{
m_ocl_devs.push_back(GSSetting(index++, dev.name.c_str(), ""));
}
#endif
}
void GSSettingsDlg::OnInit()

2
plugins/GSdx/config.h
View File

@ -47,5 +47,5 @@
//#define ENABLE_OGL_STENCIL_DEBUG
#ifdef _WINDOWS
#define ENABLE_OPENCL
//#define ENABLE_OPENCL
#endif