diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-07-06 03:16:41 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2017-07-06 12:25:46 +0300 |
| commit | 9c3f1ad003fcee40ca8f6d8091461bb8cee3db33 (patch) | |
| tree | 80dd526f0d49a231f2581eb2a9735b865929fae5 /intern/cycles/util | |
| parent | 95b345b2fe42573e0fad4c30adb865fd675316fc (diff) | |
Cycles: Add artificial memory limit debug option for OpenCL
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_debug.cpp | 4 | ||||
| -rw-r--r-- | intern/cycles/util/util_debug.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/util/util_debug.cpp b/intern/cycles/util/util_debug.cpp index ab038d2b9fb..10895f2e918 100644 --- a/intern/cycles/util/util_debug.cpp +++ b/intern/cycles/util/util_debug.cpp @@ -184,8 +184,8 @@ std::ostream& operator <<(std::ostream &os, << " Device type : " << opencl_device_type << "\n" << " Kernel type : " << opencl_kernel_type << "\n" << " Debug : " << string_from_bool(debug_flags.opencl.debug) << "\n" - << " Single program : " << string_from_bool(debug_flags.opencl.single_program) - << "\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 4505d584490..450cd900a9f 100644 --- a/intern/cycles/util/util_debug.h +++ b/intern/cycles/util/util_debug.h @@ -115,6 +115,10 @@ public: /* 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; }; /* Get instance of debug flags registry. */ |