diff options
Diffstat (limited to 'cpu_ref/rsCpuScriptGroup2.cpp')
| -rw-r--r-- | cpu_ref/rsCpuScriptGroup2.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpu_ref/rsCpuScriptGroup2.cpp b/cpu_ref/rsCpuScriptGroup2.cpp index 50b203d6..f0b657a2 100644 --- a/cpu_ref/rsCpuScriptGroup2.cpp +++ b/cpu_ref/rsCpuScriptGroup2.cpp @@ -165,7 +165,7 @@ CpuScriptGroup2Impl::CpuScriptGroup2Impl(RsdCpuReferenceImpl *cpuRefImpl, RsdCpuScriptImpl* si = (RsdCpuScriptImpl *)mCpuRefImpl->lookupScript(funcID->mScript); if (closure->mIsKernel) { - MTLaunchStruct mtls; + MTLaunchStructForEach mtls; si->forEachKernelSetup(funcID->mSlot, &mtls); cc = new CPUClosure(closure, si, (ExpandFuncTy)mtls.kernel); } else { @@ -568,7 +568,7 @@ void Batch::run() { } if (mFunc != nullptr) { - MTLaunchStruct mtls; + MTLaunchStructForEach mtls; const CPUClosure* firstCpuClosure = mClosures.front(); const CPUClosure* lastCpuClosure = mClosures.back(); @@ -582,7 +582,7 @@ void Batch::run() { mtls.fep.usr = nullptr; mtls.kernel = (ForEachFunc_t)mFunc; - mGroup->getCpuRefImpl()->launchThreads( + mGroup->getCpuRefImpl()->launchForEach( (const Allocation**)firstCpuClosure->mClosure->mArgs, firstCpuClosure->mClosure->mNumArg, lastCpuClosure->mClosure->mReturnValue, @@ -603,7 +603,7 @@ void Batch::run() { const CPUClosure* cpuClosure = mClosures.front(); const Closure* closure = cpuClosure->mClosure; - MTLaunchStruct mtls; + MTLaunchStructForEach mtls; if (cpuClosure->mSi->forEachMtlsSetup((const Allocation**)closure->mArgs, closure->mNumArg, @@ -611,10 +611,10 @@ void Batch::run() { nullptr, 0, nullptr, &mtls)) { mtls.script = nullptr; - mtls.kernel = (void (*)())&groupRoot; + mtls.kernel = &groupRoot; mtls.fep.usr = &mClosures; - mGroup->getCpuRefImpl()->launchThreads(nullptr, 0, nullptr, nullptr, &mtls); + mGroup->getCpuRefImpl()->launchForEach(nullptr, 0, nullptr, nullptr, &mtls); } for (CPUClosure* cpuClosure : mClosures) { |