Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2019-08-29 13:32:27 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2019-08-30 14:53:23 +0300
commitb9ed30c25c703c479dddab1ad6fec2adba558335 (patch)
treec30d0ccaf61712caed269fe5a20dca00735e7982 /intern/cycles/util
parent040d075f17ede12b589b08b6fe13b9e667740487 (diff)
Cycles: OpenCL Separate Compilation Debug Flag
OpenCL Parallel compilation only works inside Blender. When using cycles in a different setup (standaline or other software) it failed compiling kernels as they don't have the appropriate Python API and command line arguments. This change introduces a `running_inside_blender` debug flag, that triggers out of process compilation of the kernels. Compilation still happens in subthread that enabled the preview kernels and compilation of the kernels during BVH building Reviewed By: brecht Differential Revision: https://developer.blender.org/D5439
Diffstat (limited to 'intern/cycles/util')
-rw-r--r--intern/cycles/util/util_debug.cpp2
-rw-r--r--intern/cycles/util/util_debug.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/util/util_debug.cpp b/intern/cycles/util/util_debug.cpp
index aabfea7fc49..e52fda26845 100644
--- a/intern/cycles/util/util_debug.cpp
+++ b/intern/cycles/util/util_debug.cpp
@@ -120,7 +120,7 @@ void DebugFlags::OpenCL::reset()
debug = (getenv("CYCLES_OPENCL_DEBUG") != NULL);
}
-DebugFlags::DebugFlags() : viewport_static_bvh(false)
+DebugFlags::DebugFlags() : viewport_static_bvh(false), running_inside_blender(false)
{
/* Nothing for now. */
}
diff --git a/intern/cycles/util/util_debug.h b/intern/cycles/util/util_debug.h
index 83d9e96ffa5..5b0004ea768 100644
--- a/intern/cycles/util/util_debug.h
+++ b/intern/cycles/util/util_debug.h
@@ -33,6 +33,8 @@ class DebugFlags {
/* Use static BVH in viewport, to match final render exactly. */
bool viewport_static_bvh;
+ bool running_inside_blender;
+
/* Descriptor of CPU feature-set to be used. */
struct CPU {
CPU();