diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-21 17:05:08 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-21 17:05:08 +0400 |
| commit | 2e3035dd80ff3c69c38195f10c0ab9efdd6ed3ec (patch) | |
| tree | 8f5644232f5899a63adfd9cbbfe9e672993286f6 /intern/cycles/device/device_cuda.cpp | |
| parent | e1f79351d67c1a25c18ddf4943b8e10b034b0e2f (diff) | |
Cycles OpenCL: make displacement and world importance sampling work.
Diffstat (limited to 'intern/cycles/device/device_cuda.cpp')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 27c54af5153..6b0c9120bd9 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -704,7 +704,7 @@ public: CUfunction cuDisplace; CUdeviceptr d_input = cuda_device_ptr(task.shader_input); - CUdeviceptr d_offset = cuda_device_ptr(task.shader_output); + CUdeviceptr d_output = cuda_device_ptr(task.shader_output); /* get kernel function */ cuda_assert(cuModuleGetFunction(&cuDisplace, cuModule, "kernel_cuda_shader")) @@ -715,8 +715,8 @@ public: cuda_assert(cuParamSetv(cuDisplace, offset, &d_input, sizeof(d_input))) offset += sizeof(d_input); - cuda_assert(cuParamSetv(cuDisplace, offset, &d_offset, sizeof(d_offset))) - offset += sizeof(d_offset); + cuda_assert(cuParamSetv(cuDisplace, offset, &d_output, sizeof(d_output))) + offset += sizeof(d_output); int shader_eval_type = task.shader_eval_type; offset = align_up(offset, __alignof(shader_eval_type)); |