Updated latest Core 3.1.4 (#658)

* Updated RadeonProRenderSDK.
Adjusted build script.

* Added backward compatibility for RPR Toon.

* Review comments.

Author: VascoPi

RadeonProRenderSDK

@@ -683,7 +683,10 @@ def get_rif_sdk(base=Path()):
                  'rpr_format_ext',
                  'RPR_CONTEXT_CREATE_IMAGE_FROM_EXTERNAL_HANDLE',
                  'rprSetLogFunction',
-                 'RPR_GET_SUPPORTED_DEVICES_FUNC_NAME'
+                 'RPR_GET_SUPPORTED_DEVICES_FUNC_NAME',
+                 'rpr_debug_timings_mode',
+                 'RPR_CONTEXT_DEBUG_GET_CPU_TIMINGS',
+                 'RPR_CONTEXT_DEBUG_GET_GPU_TIMINGS'
                  ]
     )
 

src/bindings/pyrpr/src/pyrprapi.py

@@ -134,6 +134,7 @@ def sync(self, depsgraph):
         self.rpr_context.set_parameter(pyrpr.CONTEXT_PREVIEW, True)
         settings_scene.rpr.export_ray_depth(self.rpr_context)
         settings_scene.rpr.export_pixel_filter(self.rpr_context)
+        settings_scene.rpr.export_compatibility_settings(self.rpr_context)
         self.rpr_context.texture_compression = settings_scene.rpr.texture_compression
 
         self.render_samples = settings_scene.rpr.viewport_limits.preview_samples

src/rprblender/engine/preview_engine.py

@@ -771,6 +771,7 @@ def sync(self, depsgraph):
         self.rpr_context.set_parameter(pyrpr.CONTEXT_PREVIEW, False)
         scene.rpr.export_ray_depth(self.rpr_context)
         scene.rpr.export_pixel_filter(self.rpr_context)
+        scene.rpr.export_compatibility_settings(self.rpr_context)
         self.rpr_context.texture_compression = scene.rpr.texture_compression
 
         self.render_samples, self.render_time = (scene.rpr.limits.max_samples, scene.rpr.limits.seconds)

src/rprblender/engine/render_engine.py

@@ -529,6 +529,7 @@ def sync(self, context, depsgraph):
         scene.rpr.export_viewport_ray_depth(self.rpr_context)
         self.rpr_context.texture_compression = scene.rpr.texture_compression
         scene.rpr.export_pixel_filter(self.rpr_context)
+        scene.rpr.export_compatibility_settings(self.rpr_context)
 
         self.render_iterations, self.render_time = (viewport_limits.max_samples, 0)
 
@@ -1109,6 +1110,7 @@ def update_render(self, scene: bpy.types.Scene, view_layer: bpy.types.ViewLayer)
         restart = scene.rpr.export_render_mode(self.rpr_context)
         restart |= scene.rpr.export_viewport_ray_depth(self.rpr_context)
         restart |= scene.rpr.export_pixel_filter(self.rpr_context)
+        restart |= scene.rpr.export_compatibility_settings(self.rpr_context)
 
         render_iterations, render_time = (scene.rpr.viewport_limits.max_samples, 0)
 

src/rprblender/engine/viewport_engine.py

@@ -582,6 +582,12 @@ def update_viewport_render_preset(self, context):
         update=update_viewport_render_preset
     )
 
+    legacy_toon_shader: BoolProperty(
+        name="Use Legacy RPR Toon",
+        description="Enable backward compatibility of RPR Toon shader appearance",
+        default=False,
+    )
+
     hybrid_low_mem: BoolProperty(
         name="Use 4GB memory",
         description="Enable to support GPUs with 4Gb VRAM or less for Final render mode",
@@ -801,6 +807,13 @@ def export_viewport_render_quality(self, rpr_context):
         quality = getattr(pyrpr, 'RENDER_QUALITY_' + self.viewport_render_mode)
         return rpr_context.set_parameter(pyrpr.CONTEXT_RENDER_QUALITY, quality)
 
+    def export_compatibility_settings(self, rpr_context):
+        """ Exports backward compatibility settings """
+        if self.final_render_mode != 'FULL2':
+            return False
+
+        return rpr_context.set_parameter(pyrpr.CONTEXT_NORMALIZE_LIGHT_INTENSITY_ENABLED, not self.legacy_toon_shader)
+
     @classmethod
     def register(cls):
         log("Register")

src/rprblender/properties/render.py

@@ -239,8 +239,8 @@ def draw(self, context):
             row.prop(limits, 'seed')
             row.prop(limits, 'anim_seed', text="", icon='TIME')
 
-            row = col.row()
-            row.prop(rpr, 'texture_compression')
+            col.prop(rpr, 'texture_compression')
+            col.prop(rpr, 'legacy_toon_shader')
 
 
 class RPR_RENDER_PT_settings(RPR_Panel):