forked from bartvdbraak/blender
Cycles: Make experimental kernel build option more generic
Previously it was explicitly mentioning it's NVidia kernel related option, but in fact it's also handy for the OpenCL kernel.
This commit is contained in:
parent
c9e8888f87
commit
2ab909a88c
@ -281,7 +281,7 @@ public:
|
||||
nvcc, major, minor, machine, kernel.c_str(), cubin.c_str(), include.c_str(), cuda_version);
|
||||
|
||||
if(experimental)
|
||||
command += " -D__KERNEL_CUDA_EXPERIMENTAL__";
|
||||
command += " -D__KERNEL_EXPERIMENTAL__";
|
||||
|
||||
if(getenv("CYCLES_CUDA_EXTRA_CFLAGS")) {
|
||||
command += string(" ") + getenv("CYCLES_CUDA_EXTRA_CFLAGS");
|
||||
|
@ -191,7 +191,7 @@ if(WITH_CYCLES_CUDA_BINARIES)
|
||||
|
||||
macro(CYCLES_CUDA_KERNEL_ADD arch experimental)
|
||||
if(${experimental})
|
||||
set(cuda_extra_flags "-D__KERNEL_CUDA_EXPERIMENTAL__")
|
||||
set(cuda_extra_flags "-D__KERNEL_EXPERIMENTAL__")
|
||||
set(cuda_cubin kernel_experimental_${arch}.cubin)
|
||||
else()
|
||||
set(cuda_extra_flags "")
|
||||
|
@ -87,7 +87,7 @@ if env['WITH_BF_CYCLES_CUDA_BINARIES']:
|
||||
last_cubin_file = None
|
||||
|
||||
configs = (("kernel_%s.cubin", ''),
|
||||
("kernel_experimental_%s.cubin", ' -D__KERNEL_CUDA_EXPERIMENTAL__'))
|
||||
("kernel_experimental_%s.cubin", ' -D__KERNEL_EXPERIMENTAL__'))
|
||||
|
||||
# add command for each cuda architecture
|
||||
for arch in cuda_archs:
|
||||
|
@ -50,7 +50,7 @@ typedef struct IsectPrecalc {
|
||||
} IsectPrecalc;
|
||||
|
||||
/* Workaround for CUDA toolkit 6.5.16. */
|
||||
#if defined(__KERNEL_CPU__) || !defined(__KERNEL_CUDA_EXPERIMENTAL__) || __CUDA_ARCH__ < 500
|
||||
#if defined(__KERNEL_CPU__) || !defined(__KERNEL_EXPERIMENTAL__) || __CUDA_ARCH__ < 500
|
||||
# if (defined(i386) || defined(_M_IX86))
|
||||
ccl_device_noinline
|
||||
# else
|
||||
|
@ -84,7 +84,7 @@ CCL_NAMESPACE_BEGIN
|
||||
#define __VOLUME_SCATTER__
|
||||
|
||||
/* Experimental on GPU */
|
||||
#ifdef __KERNEL_CUDA_EXPERIMENTAL__
|
||||
#ifdef __KERNEL_EXPERIMENTAL__
|
||||
#define __SUBSURFACE__
|
||||
#define __CMJ__
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user