diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-03-08 18:31:05 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-03-08 18:31:35 +0300 |
commit | 02a7e875d74bbcdba569ac6021cf5da4ff231949 (patch) | |
tree | cfb6c152cc9328d054ce9beb3a23342a251d3550 /intern/cycles/util | |
parent | 7ecbf9b409e04a6cc3eb03bd42e94bb56eefca0b (diff) |
Cycles OpenCL: Remove single program
Part of the cleanup of the OpenCL codebase.
Single program is not effective when using OpenCL, it is slower
to compile and slower during rendering (when used in for example
`barbershop` or `victor`).
Reviewers: brecht, #cycles
Maniphest Tasks: T62267
Differential Revision: https://developer.blender.org/D4481
Diffstat (limited to 'intern/cycles/util')
-rw-r--r-- | intern/cycles/util/util_debug.cpp | 5 | ||||
-rw-r--r-- | intern/cycles/util/util_debug.h | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/intern/cycles/util/util_debug.cpp b/intern/cycles/util/util_debug.cpp index e8929c32394..b4cc69411ed 100644 --- a/intern/cycles/util/util_debug.cpp +++ b/intern/cycles/util/util_debug.cpp @@ -90,8 +90,7 @@ void DebugFlags::CUDA::reset() DebugFlags::OpenCL::OpenCL() : device_type(DebugFlags::OpenCL::DEVICE_ALL), - debug(false), - single_program(false) + debug(false) { reset(); } @@ -123,7 +122,6 @@ void DebugFlags::OpenCL::reset() } /* Initialize other flags from environment variables. */ debug = (getenv("CYCLES_OPENCL_DEBUG") != NULL); - single_program = (getenv("CYCLES_OPENCL_SINGLE_PROGRAM") != NULL); } DebugFlags::DebugFlags() @@ -179,7 +177,6 @@ std::ostream& operator <<(std::ostream &os, os << "OpenCL flags:\n" << " Device type : " << opencl_device_type << "\n" << " Debug : " << string_from_bool(debug_flags.opencl.debug) << "\n" - << " Single program : " << string_from_bool(debug_flags.opencl.single_program) << "\n" << " Memory limit : " << string_human_readable_size(debug_flags.opencl.mem_limit) << "\n"; return os; } diff --git a/intern/cycles/util/util_debug.h b/intern/cycles/util/util_debug.h index 9b5eb2f9fbd..e8c272cdb80 100644 --- a/intern/cycles/util/util_debug.h +++ b/intern/cycles/util/util_debug.h @@ -126,9 +126,6 @@ public: /* Use debug version of the kernel. */ bool debug; - /* Use single program */ - bool single_program; - /* TODO(mai): Currently this is only for OpenCL, but we should have it implemented for all devices. */ /* Artificial memory limit in bytes (0 if disabled). */ size_t mem_limit; |