[Bf-blender-cvs] [90b25392489] master: Cycles: Change OpenCL split kernel to use single program by default
Mai Lavelle
noreply at git.blender.org
Wed Apr 26 16:48:38 CEST 2017
Commit: 90b25392489e884278aead215884e4a85401a926
Author: Mai Lavelle
Date: Wed Apr 26 10:05:10 2017 -0400
Branches: master
https://developer.blender.org/rB90b25392489e884278aead215884e4a85401a926
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.
===================================================================
M intern/cycles/blender/addon/properties.py
M intern/cycles/util/util_debug.cpp
===================================================================
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()
More information about the Bf-blender-cvs
mailing list