From 4bdb54a76e3b15f99f2efc149b9d78aeef3203a4 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 27 May 2013 16:21:07 +0000 Subject: Cycles OpenCL: patch #35514 by Doug Gale * Support using devices from all OpenCL platforms, so that you can use e.g. both Intel and NVidia OpenCL implementations if you have them installed. * Fix compile error due to missing fmodf after recent math node change. * Enable advanced shading for Intel OpenCL. * CYCLES_OPENCL_DEBUG environment variable for generating debug symbols so you can debug with gdb. This crashes the compiler with Intel OpenCL on Linux though. To make this work the preprocessed kernel source code is written out, as gdb needs this. * Show OpenCL compiler warnings even if the build succeeded. * Some small fixes to initialize cdDevice to NULL, add missing NULL check when creating buffer and add missing space at end of build options for Apple OpenCL. * Fix crash with multi device + opencl, now e.g. CPU + GPU render should work. I did a few tweaks to the code and also: * Fix viewport render failing sometimes with Apple CPU OpenCL, was not taking workgroup size limits into account properly. * Add compile error when advanced shading in the Blender binary and OpenCL kernel are not in sync. --- intern/cycles/kernel/kernel_compat_opencl.h | 1 + 1 file changed, 1 insertion(+) (limited to 'intern/cycles/kernel/kernel_compat_opencl.h') diff --git a/intern/cycles/kernel/kernel_compat_opencl.h b/intern/cycles/kernel/kernel_compat_opencl.h index 6c41bfa5521..66cf0bb996b 100644 --- a/intern/cycles/kernel/kernel_compat_opencl.h +++ b/intern/cycles/kernel/kernel_compat_opencl.h @@ -103,6 +103,7 @@ #define atan2f(x, y) atan2(((float)x), ((float)y)) #define fmaxf(x, y) fmax(((float)x), ((float)y)) #define fminf(x, y) fmin(((float)x), ((float)y)) +#define fmodf(x, y) fmod((float)x, (float)y) /* data lookup defines */ #define kernel_data (*kg->data) -- cgit v1.2.3