From 90b25392489e884278aead215884e4a85401a926 Mon Sep 17 00:00:00 2001 From: Mai Lavelle Date: Wed, 26 Apr 2017 10:05:10 -0400 Subject: [PATCH] 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. --- intern/cycles/blender/addon/properties.py | 2 +- intern/cycles/util/util_debug.cpp | 2 +- 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()