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:
authorMai Lavelle <mai.lavelle@gmail.com>2017-04-26 17:05:10 +0300
committerMai Lavelle <mai.lavelle@gmail.com>2017-04-26 17:48:15 +0300
commit90b25392489e884278aead215884e4a85401a926 (patch)
treed787ab30638b7a7caffd471d7e0278b795981601 /intern/cycles
parentfe81a32f6916f1d8307c66965a4aea256005702b (diff)
Cycles: Change OpenCL split kernel to use single program by default
Single program builds twice as fast as multi programs, so its better for users to have it as the default.
Diffstat (limited to 'intern/cycles')
-rw-r--r--intern/cycles/blender/addon/properties.py2
-rw-r--r--intern/cycles/util/util_debug.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index e6d2a0b85b3..53740efb627 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -695,7 +695,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
update=devices_update_callback
)
- cls.debug_opencl_kernel_single_program = BoolProperty(name="Single Program", default=False, update=devices_update_callback);
+ cls.debug_opencl_kernel_single_program = BoolProperty(name="Single Program", default=True, update=devices_update_callback);
cls.debug_use_opencl_debug = BoolProperty(name="Debug OpenCL", default=False)
diff --git a/intern/cycles/util/util_debug.cpp b/intern/cycles/util/util_debug.cpp
index 9cfa57dd741..c259685f050 100644
--- a/intern/cycles/util/util_debug.cpp
+++ b/intern/cycles/util/util_debug.cpp
@@ -118,7 +118,7 @@ void DebugFlags::OpenCL::reset()
}
/* Initialize other flags from environment variables. */
debug = (getenv("CYCLES_OPENCL_DEBUG") != NULL);
- single_program = (getenv("CYCLES_OPENCL_SINGLE_PROGRAM") != NULL);
+ single_program = (getenv("CYCLES_OPENCL_MULTI_PROGRAM") == NULL);
}
DebugFlags::DebugFlags()