diff options
| author | Michael Jones <michael_p_jones@apple.com> | 2021-11-29 17:49:53 +0300 |
|---|---|---|
| committer | Michael Jones <michael_p_jones@apple.com> | 2021-11-29 17:56:06 +0300 |
| commit | 98a5c924fca00b4b39e75a4fc16585cfa040398c (patch) | |
| tree | 19ec6546e095717e7c1e3ed922f46655f7255a08 /intern/cycles/device/cuda/queue.cpp | |
| parent | f9add2d63e57e883e6befc5f6c8beffa869905ce (diff) | |
Cycles: Metal readiness: Specify DeviceQueue::enqueue arg types
This patch adds new arg-type parameters to `DeviceQueue::enqueue` and its overrides. This is in preparation for the Metal backend which needs this information for correct argument encoding.
Ref T92212
Reviewed By: brecht
Maniphest Tasks: T92212
Differential Revision: https://developer.blender.org/D13357
Diffstat (limited to 'intern/cycles/device/cuda/queue.cpp')
| -rw-r--r-- | intern/cycles/device/cuda/queue.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/device/cuda/queue.cpp b/intern/cycles/device/cuda/queue.cpp index 09352a84181..880d7ca4cf2 100644 --- a/intern/cycles/device/cuda/queue.cpp +++ b/intern/cycles/device/cuda/queue.cpp @@ -89,7 +89,9 @@ bool CUDADeviceQueue::kernel_available(DeviceKernel kernel) const return cuda_device_->kernels.available(kernel); } -bool CUDADeviceQueue::enqueue(DeviceKernel kernel, const int work_size, void *args[]) +bool CUDADeviceQueue::enqueue(DeviceKernel kernel, + const int work_size, + DeviceKernelArguments const &args) { if (cuda_device_->have_error()) { return false; @@ -133,7 +135,7 @@ bool CUDADeviceQueue::enqueue(DeviceKernel kernel, const int work_size, void *ar 1, shared_mem_bytes, cuda_stream_, - args, + const_cast<void**>(args.values), 0), "enqueue"); |