Permalink
Browse files

gsdx opencl: warning+compilation fixes

  • Loading branch information...
1 parent c232f90 commit ba91c8f0c292bf4c393da9dc7cdc54d1324e42f9 @gregory38 gregory38 committed Feb 3, 2017
Showing with 5 additions and 3 deletions.
  1. +3 −3 plugins/GSdx/GSRendererCL.cpp
  2. +2 −0 plugins/GSdx/GSdx.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;
}
}
@@ -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<uint32>(GSRendererType::DX9_OpenCL), "Direct3D9", "OpenCL"));
m_gs_renderers.push_back(GSSetting(static_cast<uint32>(GSRendererType::DX1011_OpenCL), "Direct3D11", "OpenCL"));
+#endif
m_gs_renderers.push_back(GSSetting(static_cast<uint32>(GSRendererType::OGL_OpenCL), "OpenGL", "OpenCL"));
#endif

0 comments on commit ba91c8f

Please sign in to comment.