[Bf-blender-cvs] [1451f7d0932] blender-v2.92-release: Fix T84813: enabling Cycles OpenImageDenoise during GPU viewport render fails

[Brecht Van Lommel]

Commit: 1451f7d09322dbe8596c98a2cf02712097f2a879
Author: Brecht Van Lommel
Date:   Wed Jan 20 12:41:58 2021 +0100
Branches: blender-v2.92-release
https://developer.blender.org/rB1451f7d09322dbe8596c98a2cf02712097f2a879

Fix T84813: enabling Cycles OpenImageDenoise during GPU viewport render fails

===================================================================

M	intern/cycles/render/session.h

===================================================================

diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h
index ab6c0b5f124..43ff07e5884 100644
--- a/intern/cycles/render/session.h
+++ b/intern/cycles/render/session.h
@@ -103,10 +103,10 @@ class SessionParams {
 
   bool modified(const SessionParams &params)
   {
+    /* Modified means we have to recreate the session, any parameter changes
+     * that can be handled by an existing Session are omitted. */
     return !(device == params.device && background == params.background &&
              progressive_refine == params.progressive_refine &&
-             /* samples == params.samples && denoising_start_sample ==
-                params.denoising_start_sample && */
              progressive == params.progressive && experimental == params.experimental &&
              tile_size == params.tile_size && start_resolution == params.start_resolution &&
              pixel_size == params.pixel_size && threads == params.threads &&
@@ -117,7 +117,8 @@ class SessionParams {
              text_timeout == params.text_timeout &&
              progressive_update_timeout == params.progressive_update_timeout &&
              tile_order == params.tile_order && shadingsystem == params.shadingsystem &&
-             denoising.type == params.denoising.type);
+             denoising.type == params.denoising.type &&
+             (denoising.use == params.denoising.use || (device.denoisers & denoising.type)));
   }
 };