Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-03-08 14:49:04 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-03-16 13:27:17 +0300
commit1ff753baa4bbf9aeb2c65e0d697840545bfbea24 (patch)
tree3cadd00a97b0b1437acb7eb410b288c4ce523354 /intern/cycles/kernel/kernels/opencl/kernel_queue_enqueue.cl
parent26620f3f871807d6a7dc2f2419dc67a5f196d605 (diff)
Cycles: Workaround for compilation error caused by passing KernelGlobals
Pass globals as a bare pointer, same as it sued to be prior to split kernel rework. AMD CPU platform and Intel OpenCL were complaining about this. Perhaps we shouldn't pass globals as pointer at all, this isn't something what is really portable and can cause issues on 32 bit perhaps.
Diffstat (limited to 'intern/cycles/kernel/kernels/opencl/kernel_queue_enqueue.cl')
-rw-r--r--intern/cycles/kernel/kernels/opencl/kernel_queue_enqueue.cl4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernels/opencl/kernel_queue_enqueue.cl b/intern/cycles/kernel/kernels/opencl/kernel_queue_enqueue.cl
index 9ceb6a5c3d8..19074db1b81 100644
--- a/intern/cycles/kernel/kernels/opencl/kernel_queue_enqueue.cl
+++ b/intern/cycles/kernel/kernels/opencl/kernel_queue_enqueue.cl
@@ -19,8 +19,8 @@
#include "split/kernel_queue_enqueue.h"
__kernel void kernel_ocl_path_trace_queue_enqueue(
- KernelGlobals *kg,
+ ccl_global char *kg,
ccl_constant KernelData *data)
{
- kernel_queue_enqueue(kg);
+ kernel_queue_enqueue((KernelGlobals*)kg);
}