kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: Make experimental kernel build option more generic

Browse Source 
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:
Sergey Sharybin 2015-05-15 12:45:41 +05:00
parent c9e8888f87
commit 2ab909a88c
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/device/device_cuda.cpp
View File

@ -281,7 +281,7 @@ public:
nvcc, major, minor, machine, kernel.c_str(), cubin.c_str(), include.c_str(), cuda_version); nvcc, major, minor, machine, kernel.c_str(), cubin.c_str(), include.c_str(), cuda_version);
if(experimental) if(experimental)
command += " -D__KERNEL_CUDA_EXPERIMENTAL__"; command += " -D__KERNEL_EXPERIMENTAL__";
if(getenv("CYCLES_CUDA_EXTRA_CFLAGS")) { if(getenv("CYCLES_CUDA_EXTRA_CFLAGS")) {
command += string(" ") + getenv("CYCLES_CUDA_EXTRA_CFLAGS"); command += string(" ") + getenv("CYCLES_CUDA_EXTRA_CFLAGS");

2
intern/cycles/kernel/CMakeLists.txt
View File

@ -191,7 +191,7 @@ if(WITH_CYCLES_CUDA_BINARIES)
macro(CYCLES_CUDA_KERNEL_ADD arch experimental) macro(CYCLES_CUDA_KERNEL_ADD arch experimental)
if(${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) set(cuda_cubin kernel_experimental_${arch}.cubin)
else() else()
set(cuda_extra_flags "") set(cuda_extra_flags "")

2
intern/cycles/kernel/SConscript
View File

@ -87,7 +87,7 @@ if env['WITH_BF_CYCLES_CUDA_BINARIES']:
last_cubin_file = None last_cubin_file = None
configs = (("kernel_%s.cubin", ''), 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 # add command for each cuda architecture
for arch in cuda_archs: for arch in cuda_archs:

2
intern/cycles/kernel/geom/geom_triangle_intersect.h
View File

@ -50,7 +50,7 @@ typedef struct IsectPrecalc {
} IsectPrecalc; } IsectPrecalc;
/* Workaround for CUDA toolkit 6.5.16. */ /* 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)) # if (defined(i386) || defined(_M_IX86))
ccl_device_noinline ccl_device_noinline
# else # else

2
intern/cycles/kernel/kernel_types.h
View File

@ -84,7 +84,7 @@ CCL_NAMESPACE_BEGIN
#define __VOLUME_SCATTER__ #define __VOLUME_SCATTER__
/* Experimental on GPU */ /* Experimental on GPU */
#ifdef __KERNEL_CUDA_EXPERIMENTAL__ #ifdef __KERNEL_EXPERIMENTAL__
#define __SUBSURFACE__ #define __SUBSURFACE__
#define __CMJ__ #define __CMJ__
#endif #endif