summaryrefslogtreecommitdiffstats
path: root/xmrstak
diff options
context:
space:
mode:
authorRyan <ryan@hattam.com.au>2018-02-01 20:37:50 +1030
committerGitHub <noreply@github.com>2018-02-01 20:37:50 +1030
commit064804bd17be1216dba42fa55c820294c5e763a3 (patch)
treea0092461ea7f795a466a3ade23ff361a76d34543 /xmrstak
parenta8e83eec94288cf00d5003071d24221b29f30cab (diff)
downloadxmr-stak-064804bd17be1216dba42fa55c820294c5e763a3.zip
xmr-stak-064804bd17be1216dba42fa55c820294c5e763a3.tar.gz
Fix Disabling AMD GPUs
The AMD jconf.cpp would only accept an array. The config sample, and the nvidia and cpu config work with the value 'null', as they accept a 'kNullType'. This means at current, AMD GPUs could not be turned off, the config file wouldn't parse on load. This change makes AMD consistent with the others, and can now be disabled.
Diffstat (limited to 'xmrstak')
-rw-r--r--xmrstak/backend/amd/jconf.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/xmrstak/backend/amd/jconf.cpp b/xmrstak/backend/amd/jconf.cpp
index 07afb19..f126342 100644
--- a/xmrstak/backend/amd/jconf.cpp
+++ b/xmrstak/backend/amd/jconf.cpp
@@ -56,9 +56,10 @@ struct configVal {
Type iType;
};
-//Same order as in configEnum, as per comment above
+// Same order as in configEnum, as per comment above
+// kNullType means any type
configVal oConfigValues[] = {
- { aGpuThreadsConf, "gpu_threads_conf", kArrayType },
+ { aGpuThreadsConf, "gpu_threads_conf", kNullType },
{ iPlatformIdx, "platform_index", kNumberType }
};
@@ -68,6 +69,8 @@ inline bool checkType(Type have, Type want)
{
if(want == have)
return true;
+ else if(want == kNullType)
+ return true;
else if(want == kTrueType && have == kFalseType)
return true;
else if(want == kFalseType && have == kTrueType)
OpenPOWER on IntegriCloud