summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfireice-uk <fireice-uk@users.noreply.github.com>2018-04-03 08:08:25 +0100
committerGitHub <noreply@github.com>2018-04-03 08:08:25 +0100
commit737383a5a5cac85577024aeba1da16572893cc91 (patch)
tree0bcc291624e442c47ffd625c2f26c84ec9ac3010
parent6feffe2228282814abe716d241292ca2648a4e2a (diff)
parent5ce9892bebaa3038d3282d247ffee99af8b20ae8 (diff)
downloadxmr-stak-2.4.1.zip
xmr-stak-2.4.1.tar.gz
Merge pull request #1286 from fireice-uk/dev2.4.1
Bug fix release 2.4.1
-rw-r--r--xmrstak/backend/amd/amd_gpu/gpu.cpp15
-rw-r--r--xmrstak/version.cpp2
2 files changed, 13 insertions, 4 deletions
diff --git a/xmrstak/backend/amd/amd_gpu/gpu.cpp b/xmrstak/backend/amd/amd_gpu/gpu.cpp
index 2973db4..006a7ed 100644
--- a/xmrstak/backend/amd/amd_gpu/gpu.cpp
+++ b/xmrstak/backend/amd/amd_gpu/gpu.cpp
@@ -926,7 +926,10 @@ size_t XMRSetJob(GpuContext* ctx, uint8_t* input, size_t input_len, uint64_t tar
return(ERR_OCL_API);
}
- if(miner_algo == cryptonight_heavy)
+ /* ATTENTION: if we miner cryptonight_heavy the kernel needs an additional parameter version.
+ * Do NOT use the variable `miner_algo` because this variable is changed dynamicly
+ */
+ if(::jconf::inst()->GetMiningAlgo() == cryptonight_heavy)
{
// version
if ((ret = clSetKernelArg(ctx->Kernels[0], 4, sizeof(cl_uint), &version)) != CL_SUCCESS)
@@ -975,7 +978,10 @@ size_t XMRSetJob(GpuContext* ctx, uint8_t* input, size_t input_len, uint64_t tar
return ERR_OCL_API;
}
}
- else if(miner_algo == cryptonight_heavy)
+ /* ATTENTION: if we miner cryptonight_heavy the kernel needs an additional parameter version.
+ * Do NOT use the variable `miner_algo` because this variable is changed dynamicly
+ */
+ else if(::jconf::inst()->GetMiningAlgo() == cryptonight_heavy)
{
// version
if ((ret = clSetKernelArg(ctx->Kernels[1], 3, sizeof(cl_uint), &version)) != CL_SUCCESS)
@@ -1035,7 +1041,10 @@ size_t XMRSetJob(GpuContext* ctx, uint8_t* input, size_t input_len, uint64_t tar
return(ERR_OCL_API);
}
- if(miner_algo == cryptonight_heavy)
+ /* ATTENTION: if we miner cryptonight_heavy the kernel needs an additional parameter version.
+ * Do NOT use the variable `miner_algo` because this variable is changed dynamicly
+ */
+ if(::jconf::inst()->GetMiningAlgo() == cryptonight_heavy)
{
// version
if ((ret = clSetKernelArg(ctx->Kernels[2], 7, sizeof(cl_uint), &version)) != CL_SUCCESS)
diff --git a/xmrstak/version.cpp b/xmrstak/version.cpp
index d3764e4..04948d1 100644
--- a/xmrstak/version.cpp
+++ b/xmrstak/version.cpp
@@ -18,7 +18,7 @@
#endif
#define XMR_STAK_NAME "xmr-stak"
-#define XMR_STAK_VERSION "2.4.0"
+#define XMR_STAK_VERSION "2.4.1"
#if defined(_WIN32)
#define OS_TYPE "win"
OpenPOWER on IntegriCloud