diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2019-03-09 19:19:52 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2019-03-09 19:19:52 +0300 |
| commit | 40412499433ef6d8619fd1e8ecaa00addb163721 (patch) | |
| tree | 17f9e5f936237cb4714f5ef0361f09dd0435db92 /intern/cycles/util | |
| parent | ba4d07cc5c74e42445a59bf1e77587cbf4a83482 (diff) | |
| parent | 0a28bb14222c7753a987256a9c155b670137ee37 (diff) | |
Merge branch 'blender2.7'
Conflicts:
intern/cycles/blender/addon/properties.py
intern/cycles/device/opencl/opencl_split.cpp
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; |