From c306ccb67fcf44d9bca3c4ed0f20d1af1df29f26 Mon Sep 17 00:00:00 2001 From: Gon Solo Date: Tue, 8 Nov 2022 19:31:48 +0100 Subject: Fix Cycles error with runtime compilation when there is no path to OptiX SDK If no OPTIX_ROOT is set, nvcc fails to compile because there is a stray "-I" in the arguments. Detect if the include path is empty and act accordingly. Differential Revision: https://developer.blender.org/D16308 --- intern/cycles/device/cuda/device_impl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intern/cycles/device/cuda/device_impl.h') diff --git a/intern/cycles/device/cuda/device_impl.h b/intern/cycles/device/cuda/device_impl.h index a754c33f79d..bd6d806561b 100644 --- a/intern/cycles/device/cuda/device_impl.h +++ b/intern/cycles/device/cuda/device_impl.h @@ -77,9 +77,9 @@ class CUDADevice : public Device { bool use_adaptive_compilation(); - virtual string compile_kernel_get_common_cflags(const uint kernel_features); + string compile_kernel_get_common_cflags(const uint kernel_features); - string compile_kernel(const uint kernel_features, + string compile_kernel(const string& cflags, const char *name, const char *base = "cuda", bool force_ptx = false); -- cgit v1.2.3 From 4b57bc4e5d4cada4a40d51745cc951f69f9aab08 Mon Sep 17 00:00:00 2001 From: Chris Blackbourn Date: Wed, 9 Nov 2022 08:30:18 +1300 Subject: Cleanup: format --- intern/cycles/device/cuda/device_impl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/cycles/device/cuda/device_impl.h') diff --git a/intern/cycles/device/cuda/device_impl.h b/intern/cycles/device/cuda/device_impl.h index bd6d806561b..c18f2811161 100644 --- a/intern/cycles/device/cuda/device_impl.h +++ b/intern/cycles/device/cuda/device_impl.h @@ -79,7 +79,7 @@ class CUDADevice : public Device { string compile_kernel_get_common_cflags(const uint kernel_features); - string compile_kernel(const string& cflags, + string compile_kernel(const string &cflags, const char *name, const char *base = "cuda", bool force_ptx = false); -- cgit v1.2.3