Merge pull request #237 from GPUOpen-LibrariesAndSDKs/Release_March_2021

Release march 2021

Author: bsavery

Changelog.md

@@ -1,3 +1,53 @@
+# Version 3.1
+## New Features:
+- Support for AMD Radeon™ RX 6700 XT graphics cards has been added.
+- Cryptomatte AOVs make it easy to filter objects by name or material when using compositors that support Cryptomatte (including the Blender Cryptomatte compositor node)
+- A 16-bit Machine Learning Denoiser option is now available to provide for less memory usage and greater speed.
+- The speed and responsiveness of the viewport render has been vastly improved under RPR 2.0:
+    - An option for using Machine Learning Denoising and Upscaling the viewport render is enabled under the Viewport Settings.  We now render faster at ½ resolution and use the Machine Learning Upscaler to enhance the resolution;
+    - Changing the properties tabs no longer restarts the viewport render;
+    - Stopping the viewport render is now much faster;
+    - Various other fixes to speed up the viewport render have been added.
+- An often requested feature, Box mapping in the Image Texture node, is now supported!
+- Support for Principled Hair BSDF has been added.
+- UV Lookup nodes and math nodes now work in the High, Medium, Low modes.
+
+## Issues Fixed:
+- Adaptive sampling now works correctly in the CPU mode.
+- All color spaces for textures (not just sRGB and Linear) are now used.
+- Noise seeding for animation renders has now fixed an issue of a “swimming” noise pattern.  Noise seeding is always enabled.
+- A possible error with UDIM textures has been fixed.
+- If the Step Count option in Blender was set to a value > 1, accentuated motion blur would be rendered — fixed.
+- Memory was not being freed up at the end of rendering — fixed.
+- Shadow Catcher now work with RPR 2.
+- An error at the end of rendering with the Full mode has been fixed.
+- Calculated values of light power would not update in animation — fixed.
+- Transparent background now works with RPR 2.
+- Transparent background with tile rendering was creating a lot of artefacts and produced incorrect results — fixed.
+- Instances were not updated correctly in the viewport on disabling or enabling: they were correctly removed when disabled but not displayed on enabling — fixed.
+- There was an issue with material override application/removal: it reset the object rays visibility settings and was not updated on instances — fixed.
+- Linked collection objects now use ray visibility settings, rather than the settings from the parent object.
+- Various fixes have been made to .rpr file export:
+    - Motion blur is now exported with .rpr export;
+    - Export is now implemented with selected engine mode;
+    - An image cache is used to save space and enhance speed when exporting.
+- Environment Lights and various overrides can now be rotated independently. 
+- Area lights were shadowing too aggressively — fixed.
+- Switching to contour rendering could fail on an NVidia GPU — fixed.
+- Possible crashing when rendering AOVs in the viewport has been fixed.
+- Textures could be too blurry due to incorrect MIP mapping, particularly textures in a plane parallel to the camera direction.
+- Adaptive sampling now works with RPR 2.
+- Spiral artifacts when rendering with both the CPU and GPU have been fixed.
+- The Opacity AOV was not taking the maximum ray depth into account — fixed.
+- Artifacts in the Depth AOV have been fixed.
+- Compiling the BVH geometry has been improved in large scenes.
+
+## Known Issues:
+- RPR 2.0 has some forthcoming features.  If these are needed, please use the Legacy render mode:
+    - Heterogenous volumes.
+- Tiled rendering with transparent background enabled has image artifacts with RPR 2.0.
+- Adaptive sampling does not work with CPU only rendering.
+
 # Version 3.0
 ## New Features:
 -   The new plug-in version incorporates version 2.0 of our Radeon™ ProRender system and brings about these significant changes and enhancements:

README-OSX.md

@@ -52,6 +52,7 @@ Once SSH keys are installed update/checkout submodules for active branch
 
 ### Building
 
+- NOTE.  If on MacOS 11.1 you may need to run export SDKROOT=`xcrun --show-sdk-path`    
 - After syncing the source, run:
 	- ./build_osx.sh
 

RPRBlenderHelper/CMakeLists.txt

@@ -5,22 +5,6 @@ project(RPRBlenderHelper)
 set(CMAKE_VERBOSE_MAKEFILE ON)
 set (CMAKE_CXX_STANDARD 11)
 
-find_package(OpenMP)
-
-if (${APPLE})
-    set (IGNORE_MISSING_OPENMP 1)
-endif()
-
-if (OPENMP_FOUND)
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-else()
-    if(NOT "${IGNORE_MISSING_OPENMP}")
-        message(FATAL_ERROR "OpenMP support not found! Use IGNORE_MISSING_OPENMP=ON to override.")
-    endif() 
-endif()
-
-
 set(RPR_SDK_DIR ${CMAKE_SOURCE_DIR}/../.sdk/rpr)
 set(RPRTOOLS_DIR ${RPR_SDK_DIR}/rprTools)
 set(SHARED_DIR ${CMAKE_SOURCE_DIR}/../RadeonProRenderSharedComponents)
@@ -76,7 +60,7 @@ elseif(${APPLE})
         ${OPENVDB_SDK_PATH}/OSX/lib/libtbb.a
     )
 
-else()
+else()  # Linux
     set(LIBS ${RPR_SDK_DIR}/bin/libRadeonProRender64.so)
 
 endif()

RadeonProRenderSDK

@@ -1388,6 +1388,9 @@ def set_gamma(self, gamma):
     def set_wrap(self, wrap_type):
         ImageSetWrap(self, wrap_type)
 
+    def set_colorspace(self, colorspace):
+        ImageSetOcioColorspace(self, encode(colorspace))
+
     @property
     def size_byte(self):
         if self._size_byte is None:

distlib

@@ -458,6 +458,8 @@ def calculate_depth(self):
 
     for c in root.findall('Struct'):
         name = c.get('name')
+        if name.startswith("__"):
+            continue
         struct_members = c.get('members')
         types[c.get('id')] = Struct(name, struct_members.split() if struct_members else [])
 
@@ -654,17 +656,21 @@ def get_rif_sdk(base=Path()):
     export(
         rpr_wrap_h, rpr_includes, rpr_wrap_json,
         {
-            'type':['rpr_', '_rpr'],
-            'function':['rpr',],
-            'constant':['RPR_',]
+            'type': ['rpr_', '_rpr'],
+            'function': ['rpr',],
+            'constant': ['RPR_',]
         },
         castxml,
         exclude=['RPR_CONTEXT_FLUSH_FRAMEBUFFERS_FUNC_NAME',
                  'RPR_SHAPE_SET_LIGHTMAP_CHART_INDEX_FUNC_NAME',
                  'RPR_MESH_UPDATE_FUNC_NAME',
                  'RPR_SHAPE_SET_TRANSFORM_BATCH_FUNC_NAME',
                  'rprDirectionalLightSetRasterShadowSplits',
-                 'RPR_CONTEXT_CREATE_MESH_EDITABLE_FUNC_NAME',]
+                 'RPR_CONTEXT_CREATE_MESH_EDITABLE_FUNC_NAME',
+                 'rprContextCreateCompressedImage_func',
+                 'rpr_compressed_format',
+                 'rpr_comressed_image_desc',
+                 'RPR_CONTEXT_CREATE_COMPRESSED_IMAGE',]
     )
 
     export(

src/bindings/pyrpr/src/pyrpr.py

@@ -305,9 +305,26 @@ def set_parameter(self, name, value):
         elif isinstance(value, Image):
             ImageFilterSetParameterImage(self, pyrpr.encode(name), value)
             self.parameters[name] = value
-        elif isinstance(value, tuple) and len(value) == 2:
+        elif isinstance(value, tuple):
+            size = len(value)
             if isinstance(value[0], int):
-                ImageFilterSetParameter2u(self, pyrpr.encode(name), *value)
+                if size == 2:
+                    ImageFilterSetParameter2u(self, pyrpr.encode(name), *value)
+                elif size == 3:
+                    ImageFilterSetParameter3u(self, pyrpr.encode(name), *value)
+                elif size == 4:
+                    ImageFilterSetParameter4u(self, pyrpr.encode(name), *value)
+                else:
+                    raise TypeError("Incorrect tuple size for ImageFilterSetParameter#i", self, name, value)
+            elif isinstance(value[0], float):
+                if size == 2:
+                    ImageFilterSetParameter2f(self, pyrpr.encode(name), *value)
+                elif size == 3:
+                    ImageFilterSetParameter3f(self, pyrpr.encode(name), *value)
+                elif size == 4:
+                    ImageFilterSetParameter4f(self, pyrpr.encode(name), *value)
+                else:
+                    raise TypeError("Incorrect tuple size for ImageFilterSetParameter#f", self, name, value)
             else:
                 raise TypeError("Incorrect type for ImageFilterSetParameter*", self, name, value)
             self.parameters[name] = value

src/bindings/pyrpr/src/pyrprapi.py

@@ -20,7 +20,7 @@
 bl_info = {
     "name": "Radeon ProRender",
     "author": "AMD",
-    "version": (3, 0, 8),
+    "version": (3, 1, 0),
     "blender": (2, 80, 0),
     "location": "Info header, render engine menu",
     "description": "Radeon ProRender rendering plugin for Blender 2.8x",
@@ -97,11 +97,12 @@ class RPREngine(bpy.types.RenderEngine):
     engine: Engine = None
 
     def __del__(self):
-        log('__del__', self.as_pointer())
-
         if isinstance(self.engine, ViewportEngine):
             self.engine.stop_render()
 
+        log('__del__', self.as_pointer())
+
+
     # final render
     def update(self, data, depsgraph):
         """ Called for final render """
@@ -126,7 +127,7 @@ def update(self, data, depsgraph):
             self.error_set(f"ERROR | {e}. Please see log for more details.")
 
     def render(self, depsgraph):
-        """ Called with both final render and viewport """
+        """ Called with final render and preview """
         log("render", self.as_pointer())
         try:
             self.engine.render()
@@ -135,9 +136,13 @@ def render(self, depsgraph):
             log.error(e, 'EXCEPTION:', traceback.format_exc())
             self.error_set(f"ERROR | {e}. Please see log for more details.")
 
+        # This has to be called in the end of render due to possible memory leak RPRBLND-1635
+        # Important to call it in this function, not in __del__()
+        self.engine.stop_render()
+
     # viewport render
     def view_update(self, context, depsgraph):
-        """ called when data is updated for viewport """
+        """ Called when data is updated for viewport """
         log('view_update', self.as_pointer())
 
         try:
@@ -174,25 +179,37 @@ def update_render_passes(self, render_scene=None, render_layer=None):
         Called by Blender.
         """
         aovs = properties.view_layer.RPR_ViewLayerProperites.aovs_info
+        cryptomatte_aovs = properties.view_layer.RPR_ViewLayerProperites.cryptomatte_aovs_info
 
         scene = render_scene if render_scene else bpy.context.scene
         layer = render_layer if render_scene else bpy.context.view_layer
 
+        def do_register_pass(aov):
+            pass_channel = aov['channel']
+            pass_name = aov['name']
+            pass_channels_size = len(pass_channel)
+
+            # convert from channel to blender type
+            blender_type = 'VALUE'
+            if pass_channel in ('RGB', 'RGBA'):
+                blender_type = 'COLOR'
+            elif pass_channel in {'XYZ', 'UVA'}:
+                blender_type = 'VECTOR'
+
+            self.register_pass(scene, layer,
+                               pass_name, pass_channels_size, pass_channel, blender_type)
+
         for index, enabled in enumerate(layer.rpr.enable_aovs):
             if enabled:
-                pass_channel = aovs[index]['channel']
-                pass_name = aovs[index]['name']
-                pass_channels_size = len(pass_channel)
-
-                # convert from channel to blender type
-                blender_type = 'VALUE'
-                if pass_channel in ('RGB', 'RGBA'):
-                    blender_type = 'COLOR'
-                elif pass_channel in {'XYZ', 'UVA'}:
-                    blender_type = 'VECTOR'
-
-                self.register_pass(scene, layer,
-                                   pass_name, pass_channels_size, pass_channel, blender_type)
+                do_register_pass(aovs[index])
+           
+        if layer.rpr.crytomatte_aov_material:
+            for i in range(3):
+                do_register_pass(cryptomatte_aovs[i])
+
+        if layer.rpr.crytomatte_aov_object:
+            for i in range(3,6):
+                do_register_pass(cryptomatte_aovs[i])
 
 
 @bpy.app.handlers.persistent

src/bindings/pyrpr/src/pyrprimagefilters.py

@@ -149,11 +149,19 @@ def get_frame_buffer(self, aov_type=None):
 
         return self.frame_buffers_aovs[pyrpr.AOV_COLOR]['res']
 
-    def resolve(self):
-        for aov, fbs in self.frame_buffers_aovs.items():
-            fbs['aov'].resolve(fbs['res'], aov != pyrpr.AOV_SHADOW_CATCHER)
+    def resolve(self, aovs=None):
+        if aovs:
+            for aov in aovs:
+                fbs = self.frame_buffers_aovs[aov]
+                fbs['aov'].resolve(fbs['res'], aov != pyrpr.AOV_SHADOW_CATCHER)
+        else:
+            for aov, fbs in self.frame_buffers_aovs.items():
+                fbs['aov'].resolve(fbs['res'], aov != pyrpr.AOV_SHADOW_CATCHER)
 
         if self.composite:
+            if aovs and pyrpr.AOV_COLOR not in aovs:
+                return
+
             color_aov = self.frame_buffers_aovs[pyrpr.AOV_COLOR]
             self.composite.compute(color_aov['composite'])
             if self.gl_interop:
@@ -575,12 +583,6 @@ def init(self, context_flags, context_props, use_contour_integrator=False):
         context_flags -= {pyrpr.CREATION_FLAGS_ENABLE_GL_INTEROP}
         super().init(context_flags, context_props, use_contour_integrator)
 
-    def enable_aov(self, aov_type):
-        if aov_type == pyrpr.AOV_VARIANCE:
-            return
-
-        super().enable_aov(aov_type)
-
     def sync_catchers(self, use_transparent_background=False):
         pass
 
@@ -607,3 +609,7 @@ def create_tiled_image(self, key):
         image = pyrpr2.TiledImage(self.context)
 
         return image
+
+    def sync_portal_lights(self):
+        # portals are not supported or needed in rpr2
+        return