forked from bartvdbraak/blender
Cycles: __KERNEL_DEBUG__ wasn't set for compile-time kernels
This commit is contained in:
parent
bce5b6b241
commit
e4b910a0aa
@ -170,6 +170,12 @@ if(WITH_CYCLES_CUDA_BINARIES)
|
|||||||
set(cuda_cubin kernel_${arch}.cubin)
|
set(cuda_cubin kernel_${arch}.cubin)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(WITH_CYCLES_DEBUG)
|
||||||
|
set(cuda_debug_flags "-D__KERNEL_DEBUG__")
|
||||||
|
else()
|
||||||
|
set(cuda_debug_flags "")
|
||||||
|
endif()
|
||||||
|
|
||||||
set(cuda_version_flags "-D__KERNEL_CUDA_VERSION__=${CUDA_VERSION}")
|
set(cuda_version_flags "-D__KERNEL_CUDA_VERSION__=${CUDA_VERSION}")
|
||||||
set(cuda_math_flags "--use_fast_math")
|
set(cuda_math_flags "--use_fast_math")
|
||||||
|
|
||||||
@ -185,6 +191,7 @@ if(WITH_CYCLES_CUDA_BINARIES)
|
|||||||
${cuda_version_flags}
|
${cuda_version_flags}
|
||||||
${cuda_math_flags}
|
${cuda_math_flags}
|
||||||
${cuda_extra_flags}
|
${cuda_extra_flags}
|
||||||
|
${cuda_debug_flags}
|
||||||
-I${CMAKE_CURRENT_SOURCE_DIR}/../util
|
-I${CMAKE_CURRENT_SOURCE_DIR}/../util
|
||||||
-I${CMAKE_CURRENT_SOURCE_DIR}/svm
|
-I${CMAKE_CURRENT_SOURCE_DIR}/svm
|
||||||
-DCCL_NAMESPACE_BEGIN=
|
-DCCL_NAMESPACE_BEGIN=
|
||||||
@ -197,6 +204,7 @@ if(WITH_CYCLES_CUDA_BINARIES)
|
|||||||
list(APPEND cuda_cubins ${cuda_cubin})
|
list(APPEND cuda_cubins ${cuda_cubin})
|
||||||
|
|
||||||
unset(cuda_extra_flags)
|
unset(cuda_extra_flags)
|
||||||
|
unset(cuda_debug_flags)
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
foreach(arch ${CYCLES_CUDA_BINARIES_ARCH})
|
foreach(arch ${CYCLES_CUDA_BINARIES_ARCH})
|
||||||
|
@ -79,6 +79,9 @@ if env['WITH_BF_CYCLES_CUDA_BINARIES']:
|
|||||||
nvcc_flags += " -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DNVCC"
|
nvcc_flags += " -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DNVCC"
|
||||||
nvcc_flags += " -I \"%s\" -I \"%s\" -I \"%s\" -I \"%s\"" % (util_dir, svm_dir, geom_dir, closure_dir)
|
nvcc_flags += " -I \"%s\" -I \"%s\" -I \"%s\" -I \"%s\"" % (util_dir, svm_dir, geom_dir, closure_dir)
|
||||||
|
|
||||||
|
if env['WITH_BF_CYCLES_DEBUG']:
|
||||||
|
nvcc_flags += " -D__KERNEL_DEBUG__"
|
||||||
|
|
||||||
# dependencies
|
# dependencies
|
||||||
dependencies = ['kernel.cu'] + kernel.Glob('*.h') + kernel.Glob('../util/*.h') + kernel.Glob('svm/*.h') + kernel.Glob('geom/*.h') + kernel.Glob('closure/*.h')
|
dependencies = ['kernel.cu'] + kernel.Glob('*.h') + kernel.Glob('../util/*.h') + kernel.Glob('svm/*.h') + kernel.Glob('geom/*.h') + kernel.Glob('closure/*.h')
|
||||||
last_cubin_file = None
|
last_cubin_file = None
|
||||||
|
Loading…
Reference in New Issue
Block a user