diff options
-rw-r--r-- | intern/cycles/blender/addon/engine.py | 1 | ||||
-rw-r--r-- | intern/cycles/blender/addon/properties.py | 6 | ||||
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 1 | ||||
-rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 6 | ||||
-rw-r--r-- | intern/cycles/integrator/pass_accessor.cpp | 3 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_types.h | 1 | ||||
-rw-r--r-- | intern/cycles/render/film.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/render/pass.cpp | 5 |
8 files changed, 0 insertions, 25 deletions
diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py index d729cb1ee69..c402df12ba9 100644 --- a/intern/cycles/blender/addon/engine.py +++ b/intern/cycles/blender/addon/engine.py @@ -211,7 +211,6 @@ def list_render_passes(scene, srl): if crl.use_pass_shadow_catcher: yield ("Shadow Catcher", "RGB", 'COLOR') # Debug passes. - if crl.pass_debug_render_time: yield ("Debug Render Time", "X", 'VALUE') if crl.pass_debug_sample_count: yield ("Debug Sample Count", "X", 'VALUE') # Cryptomatte passes. diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index cea70033784..8c1f26d7b9f 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -1197,12 +1197,6 @@ class CyclesCurveRenderSettings(bpy.types.PropertyGroup): class CyclesRenderLayerSettings(bpy.types.PropertyGroup): - pass_debug_render_time: BoolProperty( - name="Debug Render Time", - description="Render time in milliseconds per sample and pixel", - default=False, - update=update_render_passes, - ) pass_debug_sample_count: BoolProperty( name="Debug Sample Count", description="Number of samples/camera rays per pixel", diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index c4a1844480c..55782088444 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -792,7 +792,6 @@ class CYCLES_RENDER_PT_passes_data(CyclesButtonsPanel, Panel): col.prop(view_layer, "use_pass_material_index") col = layout.column(heading="Debug", align=True) - col.prop(cycles_view_layer, "pass_debug_render_time", text="Render Time") col.prop(cycles_view_layer, "pass_debug_sample_count", text="Sample Count") layout.prop(view_layer, "pass_alpha_threshold") diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 717f301b03e..9f5bbddbe77 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -545,8 +545,6 @@ static PassType get_blender_pass_type(BL::RenderPass &b_pass) MAP_PASS("Shadow Catcher", PASS_SHADOW_CATCHER); MAP_PASS("Noisy Shadow Catcher", PASS_SHADOW_CATCHER); - MAP_PASS("Debug Render Time", PASS_RENDER_TIME); - MAP_PASS("AdaptiveAuxBuffer", PASS_ADAPTIVE_AUX_BUFFER); MAP_PASS("Debug Sample Count", PASS_SAMPLE_COUNT); @@ -604,10 +602,6 @@ void BlenderSync::sync_render_passes(BL::RenderLayer &b_rlay, BL::ViewLayer &b_v PointerRNA crl = RNA_pointer_get(&b_view_layer.ptr, "cycles"); /* Debug passes. */ - if (get_boolean(crl, "pass_debug_render_time")) { - b_engine.add_pass("Debug Render Time", 1, "X", b_view_layer.name().c_str()); - pass_add(scene, PASS_RENDER_TIME, "Debug Render Time"); - } if (get_boolean(crl, "pass_debug_sample_count")) { b_engine.add_pass("Debug Sample Count", 1, "X", b_view_layer.name().c_str()); pass_add(scene, PASS_SAMPLE_COUNT, "Debug Sample Count"); diff --git a/intern/cycles/integrator/pass_accessor.cpp b/intern/cycles/integrator/pass_accessor.cpp index 87c048b1fa5..4f76f1fa9df 100644 --- a/intern/cycles/integrator/pass_accessor.cpp +++ b/intern/cycles/integrator/pass_accessor.cpp @@ -149,9 +149,6 @@ bool PassAccessor::get_render_tile_pixels(const RenderBuffers *render_buffers, /* Denoised passes store their final pixels, no need in special calculation. */ get_pass_float(render_buffers, buffer_params, destination); } - else if (type == PASS_RENDER_TIME) { - /* TODO(sergey): Needs implementation. */ - } else if (type == PASS_DEPTH) { get_pass_depth(render_buffers, buffer_params, destination); } diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 3cc42bf7a85..1a986c58878 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -360,7 +360,6 @@ typedef enum PassType { PASS_MATERIAL_ID, PASS_MOTION, PASS_MOTION_WEIGHT, - PASS_RENDER_TIME, PASS_CRYPTOMATTE, PASS_AOV_COLOR, PASS_AOV_VALUE, diff --git a/intern/cycles/render/film.cpp b/intern/cycles/render/film.cpp index ad3336ca089..48f87ea3bf7 100644 --- a/intern/cycles/render/film.cpp +++ b/intern/cycles/render/film.cpp @@ -326,8 +326,6 @@ void Film::device_update(Device *device, DeviceScene *dscene, Scene *scene) kfilm->pass_bake_differential = kfilm->pass_stride; break; - case PASS_RENDER_TIME: - break; case PASS_CRYPTOMATTE: kfilm->pass_cryptomatte = have_cryptomatte ? min(kfilm->pass_cryptomatte, kfilm->pass_stride) : diff --git a/intern/cycles/render/pass.cpp b/intern/cycles/render/pass.cpp index 27ad7c0db97..472c9fc0a82 100644 --- a/intern/cycles/render/pass.cpp +++ b/intern/cycles/render/pass.cpp @@ -89,7 +89,6 @@ const NodeEnum *Pass::get_type_enum() pass_type_enum.insert("material_id", PASS_MATERIAL_ID); pass_type_enum.insert("motion", PASS_MOTION); pass_type_enum.insert("motion_weight", PASS_MOTION_WEIGHT); - pass_type_enum.insert("render_time", PASS_RENDER_TIME); pass_type_enum.insert("cryptomatte", PASS_CRYPTOMATTE); pass_type_enum.insert("aov_color", PASS_AOV_COLOR); pass_type_enum.insert("aov_value", PASS_AOV_VALUE); @@ -217,10 +216,6 @@ PassInfo Pass::get_info(const PassType type, const bool include_albedo) pass_info.num_components = 3; pass_info.use_exposure = false; break; - case PASS_RENDER_TIME: - /* This pass is handled entirely on the host side. */ - pass_info.num_components = 0; - break; case PASS_DIFFUSE_COLOR: case PASS_GLOSSY_COLOR: |