Merged v4.0.0-beta
This commit is contained in:
commit
993733cb1f
231 changed files with 32642 additions and 3380 deletions
|
@ -35,6 +35,11 @@
|
|||
# include <hwloc.h>
|
||||
#endif
|
||||
|
||||
#ifdef XMRIG_FEATURE_OPENCL
|
||||
# include "backend/opencl/wrappers/OclLib.h"
|
||||
# include "backend/opencl/wrappers/OclPlatform.h"
|
||||
#endif
|
||||
|
||||
#include "base/kernel/Entry.h"
|
||||
#include "base/kernel/Process.h"
|
||||
#include "core/config/usage.h"
|
||||
|
@ -142,6 +147,12 @@ xmrig::Entry::Id xmrig::Entry::get(const Process &process)
|
|||
}
|
||||
# endif
|
||||
|
||||
# ifdef XMRIG_FEATURE_OPENCL
|
||||
if (args.hasArg("--print-platforms")) {
|
||||
return Platforms;
|
||||
}
|
||||
# endif
|
||||
|
||||
return Default;
|
||||
}
|
||||
|
||||
|
@ -161,6 +172,14 @@ int xmrig::Entry::exec(const Process &process, Id id)
|
|||
return exportTopology(process);
|
||||
# endif
|
||||
|
||||
# ifdef XMRIG_FEATURE_OPENCL
|
||||
case Platforms:
|
||||
if (OclLib::init()) {
|
||||
OclPlatform::print();
|
||||
}
|
||||
return 0;
|
||||
# endif
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -39,7 +39,8 @@ public:
|
|||
Default,
|
||||
Usage,
|
||||
Version,
|
||||
Topo
|
||||
Topo,
|
||||
Platforms
|
||||
};
|
||||
|
||||
static Id get(const Process &process);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue