diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-02-20 17:22:23 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-02-20 17:22:23 +0300 |
commit | 8a4cdda3737dd72fe1f3daa8759dce199fa87844 (patch) | |
tree | 85282e7cb99fdd2d4bfa96c32beb2118f7ec7dd7 /intern/cycles/util | |
parent | 9315cc443b1db112ca7507765e64034fdc539177 (diff) | |
parent | 949ab753bb2e2d0f76921ed6d716f074ce863f21 (diff) |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/util')
-rw-r--r-- | intern/cycles/util/util_debug.cpp | 24 | ||||
-rw-r--r-- | intern/cycles/util/util_debug.h | 3 |
2 files changed, 1 insertions, 26 deletions
diff --git a/intern/cycles/util/util_debug.cpp b/intern/cycles/util/util_debug.cpp index cd316c46b89..e8929c32394 100644 --- a/intern/cycles/util/util_debug.cpp +++ b/intern/cycles/util/util_debug.cpp @@ -90,7 +90,6 @@ void DebugFlags::CUDA::reset() DebugFlags::OpenCL::OpenCL() : device_type(DebugFlags::OpenCL::DEVICE_ALL), - kernel_type(DebugFlags::OpenCL::KERNEL_DEFAULT), debug(false), single_program(false) { @@ -122,14 +121,6 @@ void DebugFlags::OpenCL::reset() device_type = DebugFlags::OpenCL::DEVICE_ACCELERATOR; } } - /* Initialize kernel type from environment variables. */ - kernel_type = DebugFlags::OpenCL::KERNEL_DEFAULT; - if(getenv("CYCLES_OPENCL_MEGA_KERNEL_TEST") != NULL) { - kernel_type = DebugFlags::OpenCL::KERNEL_MEGA; - } - else if(getenv("CYCLES_OPENCL_SPLIT_KERNEL_TEST") != NULL) { - kernel_type = DebugFlags::OpenCL::KERNEL_SPLIT; - } /* Initialize other flags from environment variables. */ debug = (getenv("CYCLES_OPENCL_DEBUG") != NULL); single_program = (getenv("CYCLES_OPENCL_SINGLE_PROGRAM") != NULL); @@ -164,8 +155,7 @@ std::ostream& operator <<(std::ostream &os, os << "CUDA flags:\n" << " Adaptive Compile: " << string_from_bool(debug_flags.cuda.adaptive_compile) << "\n"; - const char *opencl_device_type, - *opencl_kernel_type; + const char *opencl_device_type; switch(debug_flags.opencl.device_type) { case DebugFlags::OpenCL::DEVICE_NONE: opencl_device_type = "NONE"; @@ -186,20 +176,8 @@ std::ostream& operator <<(std::ostream &os, opencl_device_type = "ACCELERATOR"; break; } - switch(debug_flags.opencl.kernel_type) { - case DebugFlags::OpenCL::KERNEL_DEFAULT: - opencl_kernel_type = "DEFAULT"; - break; - case DebugFlags::OpenCL::KERNEL_MEGA: - opencl_kernel_type = "MEGA"; - break; - case DebugFlags::OpenCL::KERNEL_SPLIT: - opencl_kernel_type = "SPLIT"; - break; - } os << "OpenCL flags:\n" << " 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" << " Memory limit : " << string_human_readable_size(debug_flags.opencl.mem_limit) << "\n"; diff --git a/intern/cycles/util/util_debug.h b/intern/cycles/util/util_debug.h index 864089bb118..9b5eb2f9fbd 100644 --- a/intern/cycles/util/util_debug.h +++ b/intern/cycles/util/util_debug.h @@ -123,9 +123,6 @@ public: /* Requested device type. */ DeviceType device_type; - /* Requested kernel type. */ - KernelType kernel_type; - /* Use debug version of the kernel. */ bool debug; |