diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-02-20 16:41:56 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-02-20 17:17:22 +0300 |
| commit | 949ab753bb2e2d0f76921ed6d716f074ce863f21 (patch) | |
| tree | cd39e16495b1c297557f9130273d0ccee45a4e16 /intern/cycles/blender | |
| parent | 667033e89e7fe5241592e72e088a19723ca906b5 (diff) | |
Cycles OpenCL: Remove OpenCL MegaKernel
Using OpenCL MegaKernel has been slow and therefore not usefull.
This patch will remove the mega kernel from the OpenCL codebase
and the OpenCLDeviceBase class.
T61736: removal of mega kernel
T61703: baking does not work with mega kernel
Tags: #cycles
Differential Revision: https://developer.blender.org/D4383
Diffstat (limited to 'intern/cycles/blender')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 1 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_python.cpp | 20 |
2 files changed, 2 insertions, 19 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index e372843d763..5d1d9e764d0 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -1634,7 +1634,6 @@ class CYCLES_RENDER_PT_debug(CyclesButtonsPanel, Panel): col = layout.column() col.label('OpenCL Flags:') - col.prop(cscene, "debug_opencl_kernel_type", text="Kernel") col.prop(cscene, "debug_opencl_device_type", text="Device") col.prop(cscene, "debug_opencl_kernel_single_program", text="Single Program") col.prop(cscene, "debug_use_opencl_debug", text="Debug") diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp index 513941b1fcc..da369d0454a 100644 --- a/intern/cycles/blender/blender_python.cpp +++ b/intern/cycles/blender/blender_python.cpp @@ -67,7 +67,6 @@ bool debug_flags_sync_from_scene(BL::Scene b_scene) PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles"); /* Backup some settings for comparison. */ DebugFlags::OpenCL::DeviceType opencl_device_type = flags.opencl.device_type; - DebugFlags::OpenCL::KernelType opencl_kernel_type = flags.opencl.kernel_type; /* Synchronize shared flags. */ flags.viewport_static_bvh = get_enum(cscene, "debug_bvh_type"); /* Synchronize CPU flags. */ @@ -81,18 +80,6 @@ bool debug_flags_sync_from_scene(BL::Scene b_scene) /* Synchronize CUDA flags. */ flags.cuda.adaptive_compile = get_boolean(cscene, "debug_use_cuda_adaptive_compile"); flags.cuda.split_kernel = get_boolean(cscene, "debug_use_cuda_split_kernel"); - /* Synchronize OpenCL kernel type. */ - switch(get_enum(cscene, "debug_opencl_kernel_type")) { - case 0: - flags.opencl.kernel_type = DebugFlags::OpenCL::KERNEL_DEFAULT; - break; - case 1: - flags.opencl.kernel_type = DebugFlags::OpenCL::KERNEL_MEGA; - break; - case 2: - flags.opencl.kernel_type = DebugFlags::OpenCL::KERNEL_SPLIT; - break; - } /* Synchronize OpenCL device type. */ switch(get_enum(cscene, "debug_opencl_device_type")) { case 0: @@ -118,8 +105,7 @@ bool debug_flags_sync_from_scene(BL::Scene b_scene) flags.opencl.debug = get_boolean(cscene, "debug_use_opencl_debug"); flags.opencl.mem_limit = ((size_t)get_int(cscene, "debug_opencl_mem_limit"))*1024*1024; flags.opencl.single_program = get_boolean(cscene, "debug_opencl_kernel_single_program"); - return flags.opencl.device_type != opencl_device_type || - flags.opencl.kernel_type != opencl_kernel_type; + return flags.opencl.device_type != opencl_device_type; } /* Reset debug flags to default values. @@ -130,10 +116,8 @@ bool debug_flags_reset() DebugFlagsRef flags = DebugFlags(); /* Backup some settings for comparison. */ DebugFlags::OpenCL::DeviceType opencl_device_type = flags.opencl.device_type; - DebugFlags::OpenCL::KernelType opencl_kernel_type = flags.opencl.kernel_type; flags.reset(); - return flags.opencl.device_type != opencl_device_type || - flags.opencl.kernel_type != opencl_kernel_type; + return flags.opencl.device_type != opencl_device_type; } } /* namespace */ |