Cycles: Viewport Rendering Memory Improvement

Small memory reduction change by only storing the pixels of the combined
pass when it is being shown in the viewport. Previously the combined pass
was always calculated and present in the output buffer. The combined pass
will still be calculated.

It is a limitation in Blender that Cycles always had a combined pass.
This patch will remove the limitation from the code base of Cycles.
Blender still has the limitation, but will always request the combined
renderpass when doing final rendering.

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D5784

1 files changed, 3 insertions, 13 deletions

diff --git a/intern/cycles/blender/blender_viewport.cpp b/intern/cycles/blender/blender_viewport.cpp
index a74b20f150b..73ef5f94720 100644
--- a/intern/cycles/blender/blender_viewport.cpp
+++ b/intern/cycles/blender/blender_viewport.cpp
@@ -72,23 +72,13 @@ PassType BlenderViewportParameters::get_viewport_display_render_pass(BL::SpaceVi
   return display_pass;
 }
 
-PassType update_viewport_display_passes(BL::SpaceView3D &b_v3d,
-                                        vector<Pass> &passes,
-                                        bool reset_passes)
+PassType update_viewport_display_passes(BL::SpaceView3D &b_v3d, vector<Pass> &passes)
 {
   if (b_v3d) {
     PassType display_pass = BlenderViewportParameters::get_viewport_display_render_pass(b_v3d);
 
-    if (reset_passes) {
-      passes.clear();
-      /* We always need a combined pass for now. It would be a good optimization
-       * to support rendering without combined pass. */
-      Pass::add(PASS_COMBINED, passes);
-    }
-
-    if (display_pass != PASS_COMBINED) {
-      Pass::add(display_pass, passes);
-    }
+    passes.clear();
+    Pass::add(display_pass, passes);
 
     return display_pass;
   }