forked from bartvdbraak/blender
Cycles: reorganize Performance panel layout, move viewport BVH type to debug.
This commit is contained in:
parent
81a76469ca
commit
296d74c4b1
@ -396,6 +396,8 @@ class CyclesRender_PT_performance(CyclesButtonsPanel, Panel):
|
||||
sub.enabled = rd.threads_mode == 'FIXED'
|
||||
sub.prop(rd, "threads")
|
||||
|
||||
col.separator()
|
||||
|
||||
sub = col.column(align=True)
|
||||
sub.label(text="Tiles:")
|
||||
sub.prop(cscene, "tile_order", text="")
|
||||
@ -405,20 +407,10 @@ class CyclesRender_PT_performance(CyclesButtonsPanel, Panel):
|
||||
|
||||
sub.prop(cscene, "use_progressive_refine")
|
||||
|
||||
subsub = sub.column(align=True)
|
||||
subsub.prop(rd, "use_save_buffers")
|
||||
|
||||
col = split.column(align=True)
|
||||
|
||||
col.label(text="Viewport:")
|
||||
col.prop(cscene, "debug_bvh_type", text="")
|
||||
col.separator()
|
||||
col.prop(cscene, "preview_start_resolution")
|
||||
col.prop(rd, "preview_pixel_size", text="")
|
||||
|
||||
col.separator()
|
||||
col = split.column()
|
||||
|
||||
col.label(text="Final Render:")
|
||||
col.prop(rd, "use_save_buffers")
|
||||
col.prop(rd, "use_persistent_data", text="Persistent Images")
|
||||
|
||||
col.separator()
|
||||
@ -431,6 +423,12 @@ class CyclesRender_PT_performance(CyclesButtonsPanel, Panel):
|
||||
row.active = not cscene.debug_use_spatial_splits
|
||||
row.prop(cscene, "debug_bvh_time_steps")
|
||||
|
||||
col = layout.column()
|
||||
col.label(text="Viewport Resolution:")
|
||||
split = col.split()
|
||||
split.prop(rd, "preview_pixel_size", text="")
|
||||
split.prop(cscene, "preview_start_resolution")
|
||||
|
||||
|
||||
class CyclesRender_PT_layer_options(CyclesButtonsPanel, Panel):
|
||||
bl_label = "Layer"
|
||||
@ -1595,11 +1593,15 @@ class CyclesRender_PT_debug(CyclesButtonsPanel, Panel):
|
||||
col.prop(cscene, "debug_use_qbvh")
|
||||
col.prop(cscene, "debug_use_cpu_split_kernel")
|
||||
|
||||
col.separator()
|
||||
|
||||
col = layout.column()
|
||||
col.label('CUDA Flags:')
|
||||
col.prop(cscene, "debug_use_cuda_adaptive_compile")
|
||||
col.prop(cscene, "debug_use_cuda_split_kernel")
|
||||
|
||||
col.separator()
|
||||
|
||||
col = layout.column()
|
||||
col.label('OpenCL Flags:')
|
||||
col.prop(cscene, "debug_opencl_kernel_type", text="Kernel")
|
||||
@ -1608,6 +1610,11 @@ class CyclesRender_PT_debug(CyclesButtonsPanel, Panel):
|
||||
col.prop(cscene, "debug_use_opencl_debug", text="Debug")
|
||||
col.prop(cscene, "debug_opencl_mem_limit")
|
||||
|
||||
col.separator()
|
||||
|
||||
col = layout.column()
|
||||
col.prop(cscene, "debug_bvh_type")
|
||||
|
||||
|
||||
class CyclesParticle_PT_CurveSettings(CyclesButtonsPanel, Panel):
|
||||
bl_label = "Cycles Hair Settings"
|
||||
|
@ -60,6 +60,8 @@ bool debug_flags_sync_from_scene(BL::Scene b_scene)
|
||||
/* 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. */
|
||||
flags.cpu.avx2 = get_boolean(cscene, "debug_use_cpu_avx2");
|
||||
flags.cpu.avx = get_boolean(cscene, "debug_use_cpu_avx");
|
||||
|
@ -626,14 +626,10 @@ SceneParams BlenderSync::get_scene_params(BL::Scene& b_scene,
|
||||
else if(shadingsystem == 1)
|
||||
params.shadingsystem = SHADINGSYSTEM_OSL;
|
||||
|
||||
if(background)
|
||||
if(background || DebugFlags().viewport_static_bvh)
|
||||
params.bvh_type = SceneParams::BVH_STATIC;
|
||||
else
|
||||
params.bvh_type = (SceneParams::BVHType)get_enum(
|
||||
cscene,
|
||||
"debug_bvh_type",
|
||||
SceneParams::BVH_NUM_TYPES,
|
||||
SceneParams::BVH_STATIC);
|
||||
params.bvh_type = SceneParams::BVH_DYNAMIC;
|
||||
|
||||
params.use_bvh_spatial_split = RNA_boolean_get(&cscene, "debug_use_spatial_splits");
|
||||
params.use_bvh_unaligned_nodes = RNA_boolean_get(&cscene, "debug_use_hair_bvh");
|
||||
|
@ -122,13 +122,16 @@ void DebugFlags::OpenCL::reset()
|
||||
}
|
||||
|
||||
DebugFlags::DebugFlags()
|
||||
: viewport_static_bvh(false)
|
||||
{
|
||||
/* Nothing for now. */
|
||||
}
|
||||
|
||||
void DebugFlags::reset()
|
||||
{
|
||||
viewport_static_bvh = false;
|
||||
cpu.reset();
|
||||
cuda.reset();
|
||||
opencl.reset();
|
||||
}
|
||||
|
||||
|
@ -30,6 +30,9 @@ CCL_NAMESPACE_BEGIN
|
||||
*/
|
||||
class DebugFlags {
|
||||
public:
|
||||
/* Use static BVH in viewport, to match final render exactly. */
|
||||
bool viewport_static_bvh;
|
||||
|
||||
/* Descriptor of CPU feature-set to be used. */
|
||||
struct CPU {
|
||||
CPU();
|
||||
|
Loading…
Reference in New Issue
Block a user