From ba91c8f0c292bf4c393da9dc7cdc54d1324e42f9 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Fri, 3 Feb 2017 23:31:01 +0100 Subject: [PATCH] gsdx opencl: warning+compilation fixes --- plugins/GSdx/GSRendererCL.cpp | 6 +++--- plugins/GSdx/GSdx.cpp | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/GSdx/GSRendererCL.cpp b/plugins/GSdx/GSRendererCL.cpp index d5896fd7c7..1f984b978d 100644 --- a/plugins/GSdx/GSRendererCL.cpp +++ b/plugins/GSdx/GSRendererCL.cpp @@ -575,7 +575,7 @@ void GSRendererCL::Sync(int reason) } #ifndef NDEBUG - for(auto page_ref : m_rw_pages_rendering) + for(const auto& page_ref : m_rw_pages_rendering) ASSERT(page_ref == 0); #endif @@ -1776,7 +1776,7 @@ bool GSRendererCL::SetupParameter(TFXJob* job, TFXParameter* pb, GSVertexCL* ver if(zwrite || ztest) { sel.zpsm = RemapPSM(context->ZBUF.PSM); - sel.ztst = ztest ? context->TEST.ZTST : ZTST_ALWAYS; + sel.ztst = ztest ? context->TEST.ZTST : (int)ZTST_ALWAYS; if(ztest) { @@ -2058,7 +2058,7 @@ cl::Kernel GSRendererCL::CL::Build(const char* entry, ostringstream& opt) for(auto b : binaries) { - delete [] b.first; + delete [] (char*)b.first; } } diff --git a/plugins/GSdx/GSdx.cpp b/plugins/GSdx/GSdx.cpp index 6456945fec..2b30dba4d3 100644 --- a/plugins/GSdx/GSdx.cpp +++ b/plugins/GSdx/GSdx.cpp @@ -164,8 +164,10 @@ void GSdxApp::Init() #ifdef ENABLE_OPENCL // OpenCL stuff goes last // FIXME openCL isn't attached to a device (could be impacted by the window management stuff however) +#ifdef _WIN32 m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX9_OpenCL), "Direct3D9", "OpenCL")); m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX1011_OpenCL), "Direct3D11", "OpenCL")); +#endif m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::OGL_OpenCL), "OpenGL", "OpenCL")); #endif