Merge pull request #315 from GPUOpen-LibrariesAndSDKs/develop

Merge 3.2

Changelog.md

@@ -1,3 +1,38 @@
+# Version 3.2
+## New Features:
+- Subsurface Scattering and Volume shaders now work in RPR 2.0.  This allows the rendering of organic materials, such as skin, which absorb light into their interior.  Volume shaders can now also be used for simple fog boxes. Also the Volume Scatter node is supported. 
+- Viewport denoising and upscaling improves the interactivity and speed of Viewport rendering.  With the use of the Radeon Image Filter Library, this allows Radeon ProRender to render at half resolution faster, and then upscale to the full size of the Viewport.
+- Deformation motion blur gives accurate motion blur to objects which are being deformed, for example, a flag flapping in the wind or a ball squashing.  Besides, motion blur export has been optimized, and a setting for disabling deformation motion blur has been added.
+- A new RPR Toon Shader has been added.  This enables cartoon-style shading for a non-photorealistic look.  Toon shaders can be used in a “simple” mode for just setting a color or a gradient of different colors for shadow vs lit areas of the object.
+- Support for Blender 2.93 has been added.
+- The look of “blocky” displacements has been significantly improved by enabling subdivision by default on objects with displacement shaders.  However, this does render slower, and can be overridden with the RPR Object Subdivision settings.
+- Support has been added for Reflection Catcher and Transparent background in the Viewport in the Full mode.
+- Outline rendering (formerly called Contour rendering) is now moved to the view layer AOV section. Outline rendering can be enabled just as the other AOVs.  The rendering process with Outline rendering enabled will take two passes per view layer, with the second doing the Outline rendering.
+- Support for (Shutter) Position in the Motion Blur settings has been added.  This uses the cycles setting to control the shutter opening around the frame number.  
+- Support for the Voronoi Texture node is added.
+
+## Issues Fixed:
+- Improve prop name readability in Object visibility UI. 
+- Texture compression was causing artifacts in some scenes.  A “texture compression” setting has been added and defaulted to False.  You can enable this setting for faster renders, but make sure that there are no texture artifacts.
+- The issue with the add-on not loading in versions of Blender downloaded from the Windows app store has been fixed.
+- Objects set as Reflection Catchers now work in the Full mode.
+- Overbright edges of objects with Uber shaders in metalness mode ― fixed.
+- Shaders with high roughness could have artifacts with reflection or refraction ― fixed.
+- Tiled rendering with a transparent background in the Full render quality has been fixed. 
+- Occasional issues in starting the add-on in certain OSs have been fixed. 
+- The option "Viewport Denoising and Upscaling" is saved to the scene settings.
+- Memory leak in Viewport rendering with the Upscale filter enabled has been fixed.
+- Image filters on Ubuntu20 have been fixed.
+- Iterating all of view layers when baking all objects have been fixed.
+- Fixed a crash in the viewport render if an object with hair and modifiers was not enabled for viewport display.
+- Fixed an error with math nodes set to “Smooth min” or “Compare” modes.
+
+## Known Issues:
+- In RPR 2.0, heterogenous volumes, smoke and fire simulations or VDB files are not yet supported.
+- Subsurface scattering and volume shader are currently disabled on macOS due to long compile times.
+- Some AOVs may have artifacts on AMD cards with drivers earlier than 21.6.1
+
+
 # Version 3.1
 ## New Features:
 - Support for AMD Radeon™ RX 6700 XT graphics cards has been added.

RPRBlenderHelper/CMakeLists.txt

@@ -8,7 +8,6 @@ set (CMAKE_CXX_STANDARD 11)
 set(RPR_SDK_DIR ${CMAKE_SOURCE_DIR}/../.sdk/rpr)
 set(RPRTOOLS_DIR ${RPR_SDK_DIR}/rprTools)
 set(SHARED_DIR ${CMAKE_SOURCE_DIR}/../RadeonProRenderSharedComponents)
-set(OPENVDB_SDK_PATH ${SHARED_DIR}/OpenVdb)
 
 set(SOURCES
     RPRBlenderHelper/RPRBlenderHelper.cpp
@@ -26,32 +25,52 @@ include_directories(
 
 if(WIN32)
     list(APPEND SOURCES
-        RPRBlenderHelper/OpenVdb.cpp
         RPRBlenderHelper/dllmain.cpp
     )
     include_directories(
-        ${OPENVDB_SDK_PATH}/include
         ${SHARED_DIR}/RadeonProRenderLibs/rprLibs
 	)
-
     set(LIBS
         ${RPR_SDK_DIR}/lib/RadeonProRender64.lib
-        ${OPENVDB_SDK_PATH}/Windows/lib/openvdb.lib
-        ${OPENVDB_SDK_PATH}/Windows/lib/Half-2_3.lib
-        ${OPENVDB_SDK_PATH}/Windows/lib/tbb.lib
     )
 
 elseif(${APPLE})
-    list(APPEND SOURCES
-        RPRBlenderHelper/OpenVdb.cpp
-    )
     include_directories(
-        ${OPENVDB_SDK_PATH}/include
         ${SHARED_DIR}/RadeonProRenderLibs/rprLibs
     )
-
     set(LIBS
         ${RPR_SDK_DIR}/bin/libRadeonProRender64.dylib
+    )
+
+else()  # Linux
+    set(LIBS ${RPR_SDK_DIR}/bin/libRadeonProRender64.so)
+
+endif()
+
+add_library(RPRBlenderHelper SHARED ${SOURCES})
+add_definitions(-DBLENDER_PLUGIN)
+target_link_libraries(RPRBlenderHelper ${LIBS})
+
+
+# Building RPRBlenderHelper with OPENVDB support
+set(OPENVDB_SDK_PATH ${SHARED_DIR}/OpenVdb)
+
+list(APPEND SOURCES
+    RPRBlenderHelper/OpenVdb.cpp
+)
+include_directories(
+    ${OPENVDB_SDK_PATH}/include
+)
+
+if(WIN32)
+    list(APPEND LIBS
+        ${OPENVDB_SDK_PATH}/Windows/lib/openvdb.lib
+        ${OPENVDB_SDK_PATH}/Windows/lib/Half-2_3.lib
+        ${OPENVDB_SDK_PATH}/Windows/lib/tbb.lib
+    )
+
+elseif(${APPLE})
+    list(APPEND LIBS
         ${OPENVDB_SDK_PATH}/OSX/lib/libopenvdb.a
         ${OPENVDB_SDK_PATH}/OSX/lib/libz.a
         ${OPENVDB_SDK_PATH}/OSX/lib/libblosc.a
@@ -60,13 +79,11 @@ elseif(${APPLE})
         ${OPENVDB_SDK_PATH}/OSX/lib/libtbb.a
     )
 
-else()  # Linux
-    set(LIBS ${RPR_SDK_DIR}/bin/libRadeonProRender64.so)
+else()
+    return()
 
 endif()
 
-add_library(RPRBlenderHelper SHARED ${SOURCES})
-
+add_library(RPRBlenderHelper_vdb SHARED ${SOURCES})
 add_definitions(-DBLENDER_PLUGIN)
-
-target_link_libraries(RPRBlenderHelper ${LIBS})
+target_link_libraries(RPRBlenderHelper_vdb ${LIBS})

build.cmd

@@ -76,6 +76,7 @@ py -3.7 src\bindings\pyrpr\src\pyrprapi.py %castxml%
 set bindingsOk=.\bindings-ok
 if exist %bindingsOk% (
 	py -3.7 build.py
+	py -3.9 build.py
 ) else (
 	echo Compiling bindings failed
 )

build.py

@@ -20,7 +20,6 @@
 import platform
 import subprocess
 from pathlib import Path
-import shutil
 
 
 arch = platform.architecture()
@@ -37,18 +36,17 @@
 os.chdir(str(pyrpr_path))
 pyrpr_build_dir = Path('.build')
 
-if Path('.build').exists():
-    shutil.rmtree(str(pyrpr_build_dir))
-
 subprocess.check_call([sys.executable, 'rpr.py'])
 subprocess.check_call([sys.executable, 'rpr_load_store.py'])
 os.chdir(cwd)
 
-os.chdir('RPRBlenderHelper')
-os.makedirs('.build', exist_ok=True)
-os.chdir('.build')
-if 'Windows' == platform.system():
-    subprocess.check_call(['cmake', '-G', 'Visual Studio 14 2015 Win64',  '..'])
-else:
-    subprocess.check_call(['cmake', '..'])
-subprocess.check_call(['cmake', '--build',  '.', '--config', 'Release', '--clean-first'])
+if sys.version_info.major == 3 and sys.version_info.minor == 7:
+    # we are going to build RPRBlenderHelper only for python 3.7
+    os.chdir('RPRBlenderHelper')
+    os.makedirs('.build', exist_ok=True)
+    os.chdir('.build')
+    if 'Windows' == platform.system():
+        subprocess.check_call(['cmake', '-G', 'Visual Studio 14 2015 Win64',  '..'])
+    else:
+        subprocess.check_call(['cmake', '..'])
+    subprocess.check_call(['cmake', '--build',  '.', '--config', 'Release', '--clean-first'])

build.sh

@@ -4,6 +4,7 @@ if [ -f "$cxml" ]; then
 	python3.7 src/bindings/pyrpr/src/pyrprapi.py $cxml
 	if [ -f "./bindings-ok" ]; then
 		python3.7 build.py
+		python3.9 build.py
 	else
 		echo Compiling bindings failed
 	fi

build_osx.sh

@@ -17,6 +17,7 @@ if [ -f "$cxml" ]; then
 	python3.7 src/bindings/pyrpr/src/pyrprapi.py $cxml
 	if [ -f "./bindings-ok" ]; then
 		python3.7 build.py
+		python3.9 build.py
 		#sh osx/postbuild.sh
 	else
 		echo Compiling bindings failed

cmd_tools/create_sdk.py

@@ -37,6 +37,10 @@ def recreate_sdk():
     copy_rif_sdk()
 
 
+def find_file(path, glob):
+    return next(f for f in path.glob(glob) if not f.is_symlink())
+
+
 def copy_rpr_sdk():
     rpr_dir = Path("RadeonProRenderSDK/RadeonProRender")
 
@@ -85,7 +89,7 @@ def copy_rif_sdk():
     # getting rif bin_dir
     os_str = {
         'Windows': "Windows",
-        'Linux': "Ubuntu18",
+        'Linux': "Ubuntu20",
         'Darwin': "OSX"
     }[OS]
     bin_dir = rif_dir / os_str / "Dynamic"
@@ -109,27 +113,32 @@ def copy_rif_sdk():
             shutil.copy(str(lib), str(sdk_lib_dir))
 
     elif OS == 'Linux':
-        shutil.copy(str(bin_dir / "libRadeonImageFilters.so.1.6.1"),
+        shutil.copy(str(find_file(bin_dir, "libRadeonImageFilters.so*")),
                     str(sdk_bin_dir / "libRadeonImageFilters.so"))
-        shutil.copy(str(bin_dir / "libRadeonML_MIOpen.so.0.9.8"),
+        shutil.copy(str(find_file(bin_dir, "libRadeonML_MIOpen.so*")),
                     str(sdk_bin_dir / "libRadeonML_MIOpen.so"))
-        shutil.copy(str(bin_dir / "libOpenImageDenoise.so.0.9.0"),
+        shutil.copy(str(find_file(bin_dir, "libOpenImageDenoise.so*")),
                     str(sdk_bin_dir / "libOpenImageDenoise.so"))
-        shutil.copy(str(bin_dir / "libMIOpen.so.2.0.4"),
+        shutil.copy(str(find_file(bin_dir, "libMIOpen.so.2*")),
                     str(sdk_bin_dir / "libMIOpen.so.2"))
+        shutil.copy(str(find_file(bin_dir, "libRadeonML.so.0*")),
+                    str(sdk_bin_dir / "libRadeonML.so.0"))
 
     elif OS == 'Darwin':
-        shutil.copy(str(bin_dir / "libRadeonImageFilters.1.6.1.dylib"),
+        shutil.copy(str(find_file(bin_dir, "libRadeonImageFilters*.dylib")),
                     str(sdk_bin_dir / "libRadeonImageFilters.dylib"))
-        shutil.copy(str(bin_dir / "libOpenImageDenoise.0.9.0.dylib"),
+        shutil.copy(str(find_file(bin_dir, "libOpenImageDenoise*.dylib")),
                     str(sdk_bin_dir / "libOpenImageDenoise.dylib"))
-        shutil.copy(str(bin_dir / "libRadeonML_MPS.0.9.8.dylib"),
+        shutil.copy(str(find_file(bin_dir, "libRadeonML_MPS*.dylib")),
                     str(sdk_bin_dir / "libRadeonML_MPS.dylib"))
+        shutil.copy(str(find_file(bin_dir, "libRadeonML.0*.dylib")),
+                    str(sdk_bin_dir / "libRadeonML.0.dylib"))
 
         # adjusting id of RIF libs
         install_name_tool('-id', "@rpath/libRadeonImageFilters.dylib", sdk_bin_dir / "libRadeonImageFilters.dylib")
         install_name_tool('-id', "@rpath/libOpenImageDenoise.dylib", sdk_bin_dir / "libOpenImageDenoise.dylib")
         install_name_tool('-id', "@rpath/libRadeonML_MPS.dylib", sdk_bin_dir / "libRadeonML_MPS.dylib")
+        install_name_tool('-id', "@rpath/libRadeonML.0.dylib", sdk_bin_dir / "libRadeonML.0.dylib")
 
     else:
         raise KeyError("Unsupported OS", OS)

run_blender_with_rpr.cmd

@@ -19,6 +19,9 @@ REM  *******************************************************************
 
 if ""=="%BLENDER_EXE%" goto error
 
+REM set Debug Mode flag
+set RPR_BLENDER_DEBUG=1
+
 py cmd_tools/run_blender.py "%BLENDER_EXE%" cmd_tools/test_rpr.py
 pause
 REM it's much easier to get issue traceback on crash if pause is present; remove if not needed

run_blender_with_rpr_Ubuntu.sh

@@ -65,6 +65,7 @@ function main()
 {
 	init
 
+  export RPR_BLENDER_DEBUG=1
 	export LD_LIBRARY_PATH="$WORK_DIR:$LD_LIBRARY_PATH"
 
 	python3 cmd_tools/run_blender.py "$BLENDER_EXE" cmd_tools/test_rpr.py

run_blender_with_rpr_osx.sh

@@ -30,6 +30,8 @@ if [ -x "${BLENDER_EXE}" ]; then
 	CDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 	DIST_LIB="$CDIR/distlib"
 
+  # set Debug Mode flag
+  export RPR_BLENDER_DEBUG=1
 	export LD_LIBRARY_PATH="$DIST_LIB"
 
 	python3 cmd_tools/run_blender.py "$BLENDER_EXE" cmd_tools/test_rpr.py "$DEBUGGER_EXE"

src/RPRBlender.pyproj

@@ -47,6 +47,7 @@
     <Compile Include="rprblender\engine\image_filter.py" />
     <Compile Include="rprblender\engine\preview_engine.py" />
     <Compile Include="rprblender\engine\render_engine.py" />
+    <Compile Include="rprblender\engine\render_engine_2.py" />
     <Compile Include="rprblender\engine\render_engine_hybrid.py" />
     <Compile Include="rprblender\engine\viewport_engine.py" />
     <Compile Include="rprblender\engine\viewport_engine_2.py" />

src/bindings/pyrpr/rpr.py

@@ -42,7 +42,9 @@ def export(json_file_name, dependencies, header_file_name, cffi_name, output_nam
 
     ffi.cdef(Path('rprapi.h').read_text())
 
-    lib_names = ['RadeonProRender64', 'RadeonImageFilters', 'python37']
+
+    lib_names = ['RadeonProRender64', 'RadeonImageFilters',
+                 f'python{sys.version_info.major}{sys.version_info.minor}']
 
     inc_dir = [str(base / "src/bindings/pyrpr"),
                str(rpr_sdk['inc']),
@@ -89,7 +91,11 @@ def export(json_file_name, dependencies, header_file_name, cffi_name, output_nam
     shutil.copy(_cffi_backend.__file__, str(build_dir))
 
     if 'Linux' == platform.system():
-        for path in (Path(_cffi_backend.__file__).parent / '.libs_cffi_backend').iterdir():
+        cffi_libs_dir = Path(_cffi_backend.__file__).parent / '.libs_cffi_backend'
+        if not cffi_libs_dir.is_dir():
+            cffi_libs_dir = Path(_cffi_backend.__file__).parent / 'cffi.libs'
+
+        for path in cffi_libs_dir.iterdir():
             if '.so' in path.suffixes:
                 # copy library needed for cffi backend
                 ffi_lib = str(path)
@@ -133,10 +139,8 @@ def write_api(api_desc_fpath, f, abi_mode):
         else:
             print('typedef ', t.type, name, ';', file=f)
     for name, t in api.functions.items():
-        if 'rprxGetLog' == name:
-            continue
         if 'rifContextExecuteCommandQueue' == name:
-            print('rif_int rifContextExecuteCommandQueue(rif_context context, rif_command_queue command_queue, void *executeFinishedCallbackFunction(void* userdata), void* data, float* time);', file=f)
+            print('rif_int rifContextExecuteCommandQueue(rif_context context, rif_command_queue command_queue, void *executeFinishedCallbackFunction(void* userdata), void* data, rif_performance_statistic* statistics);', file=f)
             continue
         print(name, [(arg.name, arg.type) for arg in t.args])
         print(t.restype, name, '(' + ', '.join(arg.type + ' ' + arg.name for arg in t.args) + ');', file=f)

src/bindings/pyrpr/src/pyhybrid.py

@@ -132,6 +132,16 @@ class Camera(pyrpr.Camera):
     pass
 
 
+@class_ignore_unsupported
+class ImageData(pyrpr.ImageData):
+    pass
+
+
+@class_ignore_unsupported
+class ImageFile(pyrpr.ImageFile):
+    pass
+
+
 @class_ignore_unsupported
 class MaterialNode(pyrpr.MaterialNode):
     def set_input(self, name, value):