Merge pull request #523 from GPUOpen-LibrariesAndSDKs/develop

Develop

.gitignore

@@ -1,2 +1,3 @@
 build/*
-pxr/imaging/plugin/hdRpr/python/__pycache__/
+pxr/imaging/plugin/hdRpr/python/__pycache__/
+.vscode

CHANGELOG.MD

@@ -1,5 +1,34 @@
 # Change Log
 
+## Version 2.2
+### New Features:
+- Support of Houdini 19.  Houdini 19 adds MaterialX nodes which Radeon ProRender supports through the plug-in.
+- Updates to the Render Quality modes: 
+    - RPR Interactive is a new mode supporting GPUs which use the Vulkan ray tracing extension, and is optimized for fast viewport rendering;
+    - RPR Final, previously Full” mode. It is intended “” for final rendering the utmost physical correctness and image quality;
+    - Both modes render similar images;
+    - Both modes support full MaterialX shader networks.
+
+### Bugs Fixed
+- Support of camera aperture offset has been added.
+- Multiple render devices as well as CPU + GPU rendering can now be selected.
+- Single color VDB volumes now work using the “gain” parameter.
+- The performance of rendering in the RPR Final mode using adaptive sampling has been improved by optimizing the active pixels check.
+- The new Gamma Tonemap filter has been added.
+- A setting for using UV to generate Outline renders has been added.
+- An issue of incorrect Subsurface Scattering on Vega GPUS has been added.
+- Black rendering of toon shaders on macOS has been fixed.
+- A crash that could occur when processing emission shaders objects with subdivision added has been eliminated.
+- The startup time for CPU rendering has been reduced.
+- Low utilization on macOS with CPU + GPU rendering has been eliminated.
+- Performance in scenes with multiple transparent materials has been improved.
+- An issue with artifacts in alpha texture masks has been fixed.
+- The render performance on Vega and Polaris GPUs has been improved.
+- Particle motion blur on GPUs has been fixed.
+- A crash that could occur when using .tif textures with zip compression has been eliminated.
+- An issue with emission shaders disappearing in volume objects has been eliminated.
+
+
 ## Version 2.1
 ### 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.

INSTALL.md

@@ -9,16 +9,16 @@ Add a new Houdini package with such configuration json:
 {
     "env":[
         {
-            "RPR":"path-to-the-package"
+            "HDRPR_DIR":"path-to-the-package"
         },
         {
-            "HOUDINI_PATH":"$RPR/houdini"
+            "HOUDINI_PATH":"$HDRPR_DIR/houdini"
         },
         {
-            "PATH":"$RPR/lib"
+            "PATH":"$HDRPR_DIR/lib"
         },
         {
-            "PYTHONPATH":"$RPR/lib/python"
+            "PYTHONPATH":"$HDRPR_DIR/lib/python"
         }
     ]
 }
@@ -35,7 +35,6 @@ More info here https://www.sidefx.com/docs/houdini/ref/plugins.html
 
 Here and next, HDRPR_PACKAGE_DIR is a path to the root of the package.
 
-* Set `RPR` environment variable to `HDRPR_PACKAGE_DIR` 
 * Add `HDRPR_PACKAGE_DIR/plugin` path entry to the `PXR_PLUGINPATH_NAME` environment variable
 * Add `HDRPR_PACKAGE_DIR/lib/python` path entry to the `PYTHONPATH` environment variable
 * Windows only: add the `HDRPR_PACKAGE_DIR/lib` path entry to the `PATH` environment variable

README.md

@@ -50,7 +50,7 @@ Cloning into 'RadeonProRenderUSD'...
 
 Provide USD in one of two ways:
 
-* An installation of USD. Define pxr_DIR to point to it when running cmake, if required. You can download USD to build yourself from [GitHub](https://www.github.com/PixarAnimationStudios/USD).
+* An installation of USD. Define pxr_DIR to point to it when running cmake, if required. You can download USD to build yourself from [GitHub](https://www.github.com/PixarAnimationStudios/USD). It should be built with OpenEXR libraries and usdGenSchema tool.
 * The USD which is provided with Houdini. The HFS environment variable should point to the Houdini installation (the correct way is to run cmake from Houdini's `Command Line Tools` or by sourcing `houdini_setup`). You can download Houdini installer from [Downloads | SideFX](https://www.sidefx.com/download).
 
 ##### MaterialX Component

cmake/defaults/Packages.cmake

@@ -54,6 +54,22 @@ if(NOT pxr_FOUND AND NOT HoudiniUSD_FOUND AND NOT USDMonolithic_FOUND)
     message(FATAL_ERROR "Required: USD install or Houdini with included USD.")
 endif()
 
+if(NOT HoudiniUSD_FOUND)
+    list(APPEND CMAKE_PREFIX_PATH ${pxr_DIR})
+    find_program(USD_SCHEMA_GENERATOR
+        NAMES usdGenSchema.py usdGenSchema
+        PATHS ${pxr_DIR}/bin
+        REQUIRED
+        NO_DEFAULT_PATH)
+    if(USD_SCHEMA_GENERATOR)
+        list(PREPEND USD_SCHEMA_GENERATOR python)
+    endif()
+endif()
+
+if(NOT USD_SCHEMA_GENERATOR)
+    message(FATAL_ERROR "Failed to find usd schema generator - usdGenSchema")
+endif()
+
 find_package(Rpr REQUIRED)
 find_package(Rif REQUIRED)
 
@@ -69,13 +85,25 @@ set(PXR_THREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}")
 
 if(HoudiniUSD_FOUND)
     set(HOUDINI_ROOT "$ENV{HFS}" CACHE PATH "Houdini installation dir")
-    find_package(Houdini REQUIRED CONFIG PATHS ${HOUDINI_ROOT}/toolkit/cmake)
+    set(HOUDINI_CONFIG_DIR ${HOUDINI_ROOT}/toolkit/cmake)
+    if(APPLE)
+        file(COPY
+                ${HOUDINI_ROOT}/toolkit/cmake/HoudiniConfigVersion.cmake
+            DESTINATION
+                ${CMAKE_CURRENT_BINARY_DIR})
+        file(READ ${HOUDINI_ROOT}/toolkit/cmake/HoudiniConfig.cmake HOUDINI_CONFIG)
+        string(REPLACE "_houdini_use_framework TRUE" "_houdini_use_framework FALSE" HOUDINI_CONFIG "${HOUDINI_CONFIG}")
+        string(REPLACE "\${CMAKE_CURRENT_LIST_DIR}" "\${HOUDINI_ROOT}/toolkit/cmake" HOUDINI_CONFIG "${HOUDINI_CONFIG}")
+        file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/HoudiniConfig.cmake "${HOUDINI_CONFIG}")
+        set(HOUDINI_CONFIG_DIR ${CMAKE_CURRENT_BINARY_DIR})
+    endif()
+    find_package(Houdini REQUIRED CONFIG PATHS ${HOUDINI_CONFIG_DIR})
 
     set(OPENEXR_LOCATION ${Houdini_USD_INCLUDE_DIR})
     set(OPENEXR_LIB_LOCATION ${Houdini_LIB_DIR})
 else()
     # We are using python to generate source files
-    find_package(PythonInterp 2.7 REQUIRED)
+    find_package(PythonInterp 2.7)
 endif()
 
 if (NOT PXR_MALLOC_LIBRARY)
@@ -84,7 +112,13 @@ if (NOT PXR_MALLOC_LIBRARY)
     endif()
 endif()
 
-find_package(MaterialX QUIET)
+if(NOT MaterialX_FOUND)
+    find_package(MaterialX QUIET)
+endif()
+
+if(MaterialX_FOUND)
+    set(RPR_DISABLE_CUSTOM_MATERIALX_LOADER ON)
+endif()
 
 if(RPR_ENABLE_VULKAN_INTEROP_SUPPORT)
     find_package(Vulkan REQUIRED)

cmake/defaults/Version.cmake

@@ -24,4 +24,4 @@
 # Versioning information
 set(HD_RPR_MAJOR_VERSION "2")
 set(HD_RPR_MINOR_VERSION "2")
-set(HD_RPR_PATCH_VERSION "0")
+set(HD_RPR_PATCH_VERSION "20")

cmake/defaults/msvcdefaults.cmake

@@ -27,8 +27,20 @@ set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /EHsc")
 
 # Standards compliant.
 set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /Zc:rvalueCast
-                                      /Zc:strictStrings
-                                      /Zc:inline")
+                                      /Zc:strictStrings")
+
+# The /Zc:inline option strips out the "arch_ctor_<name>" symbols used for
+# library initialization by ARCH_CONSTRUCTOR starting in Visual Studio 2019, 
+# causing release builds to fail. Disable the option for this and later 
+# versions.
+# 
+# For more details, see:
+# https://developercommunity.visualstudio.com/content/problem/914943/zcinline-removes-extern-symbols-inside-anonymous-n.html
+if (MSVC_VERSION GREATER_EQUAL 1920)
+    set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /Zc:inline-")
+else()
+    set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /Zc:inline")
+endif()
 
 # Turn on all but informational warnings.
 set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /W3")

cmake/macros/Private.cmake

@@ -44,8 +44,14 @@ function(_copy_headers LIBRARY_NAME)
     if( NOT "${_args_FILES}" STREQUAL "")
         set(files_copied "")
         foreach (f ${_args_FILES})
-            set(infile "${CMAKE_CURRENT_SOURCE_DIR}/${f}")
-            set(outfile "${header_dest_dir}/${f}")
+            if(IS_ABSOLUTE ${f})
+                set(infile "${f}")
+                get_filename_component(f_name ${f} NAME)
+                set(outfile "${header_dest_dir}/${f_name}")
+            else()
+                set(infile "${CMAKE_CURRENT_SOURCE_DIR}/${f}")
+                set(outfile "${header_dest_dir}/${f}")
+            endif()
             get_filename_component(dir_to_create "${outfile}" PATH)
             add_custom_command(
                 OUTPUT ${outfile}

cmake/modules/FindHoudiniUSD.cmake

@@ -113,6 +113,38 @@ else()
     set(Houdini_LIB_DIR ${HOUDINI_ROOT}/dsolib)
 endif()
 
+find_path(Houdini_MTLX_INCLUDE_DIR
+    "MaterialXCore/Document.h"
+    PATHS ${HOUDINI_ROOT}
+    PATH_SUFFIXES "toolkit/include"
+    NO_DEFAULT_PATH)
+if(Houdini_MTLX_INCLUDE_DIR)
+    if(WIN32)
+        find_path(Houdini_MTLX_IMPLIB_DIR
+            "MaterialXCore.lib"
+            PATHS ${HOUDINI_ROOT}
+            PATH_SUFFIXES "custom/houdini/dsolib"
+            NO_DEFAULT_PATH)
+        list(APPEND HUSD_REQ_VARS "Houdini_MTLX_IMPLIB_DIR")
+    else()
+        set(_MTLX_LIB_PREFIX "lib")
+    endif()
+
+    foreach(targetName MaterialXCore MaterialXFormat)
+        add_library(${targetName} SHARED IMPORTED)
+        set_target_properties(${targetName} PROPERTIES
+            IMPORTED_LOCATION "${Houdini_USD_LIB_DIR}/${_MTLX_LIB_PREFIX}${targetName}${CMAKE_SHARED_LIBRARY_SUFFIX}"
+            INTERFACE_INCLUDE_DIRECTORIES ${Houdini_MTLX_INCLUDE_DIR})
+        target_compile_definitions(${targetName} INTERFACE -DMATERIALX_BUILD_SHARED_LIBS)
+        if(WIN32)
+            set_target_properties(${targetName} PROPERTIES
+                IMPORTED_IMPLIB "${Houdini_MTLX_IMPLIB_DIR}/${targetName}.lib")
+        endif()
+    endforeach()
+
+    set(MaterialX_FOUND 1)
+endif()
+
 include(FindPackageHandleStandardArgs)
 
 find_package_handle_standard_args(
@@ -125,9 +157,18 @@ if(HoudiniUSD_FOUND)
     message(STATUS "  Houdini Python includes: ${Houdini_Python_INCLUDE_DIR}")
     message(STATUS "  Houdini Python lib: ${Houdini_Python_LIB}")
     message(STATUS "  Houdini Boost.Python lib: ${Houdini_Boostpython_LIB}")
+    if(MaterialX_FOUND)
+        message(STATUS "  Houdini MaterialX: ${Houdini_MTLX_INCLUDE_DIR}")
+    endif()
 endif()
 
 if(HoudiniUSD_FOUND AND NOT TARGET hd)
+    set(version_file ${Houdini_USD_INCLUDE_DIR}/pxr/pxr.h)
+    file(STRINGS "${version_file}" PXR_VERSION
+         REGEX "^#define[\t ]+PXR_VERSION[\t ]+.*")
+    string(REGEX REPLACE "^.*PXR_VERSION[\t ]+([0-9]*).*$" "\\1"
+           PXR_VERSION "${PXR_VERSION}")
+
     # Generic creation of the usd targets. This is not meant to be perfect. The
     # criteria is "does it work for our use". Also, these names match the ones
     # of the USD distribution so we can use either without many conditions.
@@ -136,8 +177,8 @@ if(HoudiniUSD_FOUND AND NOT TARGET hd)
     foreach(targetName
         arch tf gf js trace work plug vt ar kind sdf ndr sdr pcp usd usdGeom
         usdVol usdLux usdMedia usdShade usdRender usdHydra usdRi usdSkel usdUI
-        usdUtils garch hf hio cameraUtil pxOsd glf hgi hgiGL hd hdSt hdx
-        usdImaging usdImagingGL usdRiImaging usdSkelImaging usdVolImaging
+        usdUtils garch hf hio cameraUtil pxOsd glf hgi hgiGL hd hdSt hdMtlx hdx
+        usdImaging usdImagingGL usdRiImaging usdSkelImaging usdVolI maging
         usdAppUtils usdviewq)
         add_library(${targetName} SHARED IMPORTED)
         set_target_properties(${targetName} PROPERTIES
@@ -175,4 +216,16 @@ if(HoudiniUSD_FOUND AND NOT TARGET hd)
     endif(APPLE)
     # By default Boost links libraries implicitly for the user via pragma's, we do not want this
     target_compile_definitions(tf INTERFACE -DHBOOST_ALL_NO_LIB)
+
+    set(HOUDINI_BIN ${HOUDINI_ROOT}/bin)
+    find_program(USD_SCHEMA_GENERATOR
+        NAMES
+            usdGenSchema.py usdGenSchema
+        PATHS
+            ${HOUDINI_BIN}
+        REQUIRED
+        NO_DEFAULT_PATH)
+    if(USD_SCHEMA_GENERATOR)
+        set(USD_SCHEMA_GENERATOR ${HOUDINI_BIN}/hython ${USD_SCHEMA_GENERATOR})
+    endif()
 endif()

cmake/modules/FindRif.cmake

@@ -35,18 +35,22 @@ find_library(RIF_LIBRARY
 if(WIN32)
     set(RIF_BINARIES
         ${RIF_LOCATION_LIB}/dxcompiler.dll
+	${RIF_LOCATION_LIB}/dxil.dll
         ${RIF_LOCATION_LIB}/MIOpen.dll
         ${RIF_LOCATION_LIB}/RadeonImageFilters.dll
+        ${RIF_LOCATION_LIB}/RadeonML.dll
         ${RIF_LOCATION_LIB}/RadeonML_MIOpen.dll
         ${RIF_LOCATION_LIB}/RadeonML_DirectML.dll)
 else(WIN32)
     if(APPLE)
         set(RIF_DEPENDENCY_LIBRARIES
+            ${RIF_LOCATION_LIB}/libRadeonML.dylib
             ${RIF_LOCATION_LIB}/libRadeonML_MPS.dylib)
     else()
         set(RIF_DEPENDENCY_LIBRARIES
             ${RIF_LOCATION_LIB}/libMIOpen.so
-            ${RIF_LOCATION_LIB}/libRadeonML_MIOpen.so)
+            ${RIF_LOCATION_LIB}/libRadeonML_MIOpen.so
+            ${RIF_LOCATION_LIB}/libRadeonML.so.0)
     endif(APPLE)
 endif(WIN32)
 

cmake/modules/FindRpr.cmake

@@ -49,7 +49,7 @@ find_library(RPR_LOADSTORE_LIBRARY
     NO_SYSTEM_ENVIRONMENT_PATH
 )
 
-foreach(entry "Tahoe64;TAHOE" "Northstar64;NORTHSTAR" "Hybrid;HYBRID")
+foreach(entry "Tahoe64;TAHOE" "Northstar64;NORTHSTAR" "Hybrid;HYBRID" "HybridPro;HYBRID_PRO")
     list(GET entry 0 libName)
     list(GET entry 1 libId)
 
@@ -89,10 +89,13 @@ find_package_handle_standard_args(Rpr
     REQUIRED_VARS
         RPR_LOCATION_INCLUDE
         RPR_VERSION_STRING
-        RPR_LOADSTORE_LIBRARY
         RPR_LIBRARY
 )
 
 add_library(rpr INTERFACE)
 target_include_directories(rpr INTERFACE ${RPR_LOCATION_INCLUDE})
-target_link_libraries(rpr INTERFACE ${RPR_LIBRARY} ${RPR_LOADSTORE_LIBRARY})
+target_link_libraries(rpr INTERFACE ${RPR_LIBRARY})
+if(RPR_LOADSTORE_LIBRARY)
+    target_compile_definitions(rpr INTERFACE -DRPR_LOADSTORE_AVAILABLE)
+    target_link_libraries(rpr INTERFACE ${RPR_LOADSTORE_LIBRARY})
+endif()

cmake/modules/FindUSDMonolithic.cmake

@@ -17,7 +17,9 @@ find_path(USD_LIBRARY_DIR
     NO_SYSTEM_ENVIRONMENT_PATH)
 
 find_library(USD_MONOLITHIC_LIBRARY
-    NAMES ${PXR_LIB_PREFIX}usd_ms
+    NAMES
+        usd_ms # Windows requires raw library name to find
+        ${PXR_LIB_PREFIX}usd_ms${CMAKE_SHARED_LIBRARY_SUFFIX} # Linux requires prefix and suffix
     PATHS ${USD_LIBRARY_DIR}
     NO_DEFAULT_PATH
     NO_SYSTEM_ENVIRONMENT_PATH)

deps/CMakeLists.txt

@@ -1,7 +1,7 @@
 # MaterialX
 # ----------------------------------------------
 
-if(NOT MaterialX_FOUND)
+if(NOT RPR_DISABLE_CUSTOM_MATERIALX_LOADER)
     # If MaterialX was not explicitly provided, use the one from a submodule
     set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
     set(MATERIALX_PYTHON_LTO OFF)
@@ -16,19 +16,20 @@ if(NOT MaterialX_FOUND)
         add_subdirectory(MaterialX EXCLUDE_FROM_ALL) # EXCLUDE_FROM_ALL allows us to skip installation of mtlx static libraries
     endif()
 
+    set(MTLX_STDLIB_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/plugin/usd/rprUsd/resources/mtlx)
     install(
         FILES
             MaterialX/libraries/bxdf/standard_surface.mtlx
             MaterialX/libraries/bxdf/usd_preview_surface.mtlx
         DESTINATION
-            libraries/bxdf)
+            ${MTLX_STDLIB_INSTALL_PATH}/libraries/bxdf)
     foreach(mtlx_lib stdlib pbrlib)
         install(
             FILES
                 MaterialX/libraries/${mtlx_lib}/${mtlx_lib}_ng.mtlx
                 MaterialX/libraries/${mtlx_lib}/${mtlx_lib}_defs.mtlx
             DESTINATION
-                libraries/${mtlx_lib})
+                ${MTLX_STDLIB_INSTALL_PATH}/libraries/${mtlx_lib})
     endforeach()
 endif()
 
@@ -48,14 +49,19 @@ if(NOT RPR_CPP_WRAPPER_LOCATION)
 endif()
 
 add_library(cpprpr STATIC
-    ${RPRMTLXLOADER_LOCATION}/rprMtlxLoader.h
-    ${RPRMTLXLOADER_LOCATION}/rprMtlxLoader.cpp
     ${RPR_CPP_WRAPPER_LOCATION}/RadeonProRender.hpp
     ${RPR_CPP_WRAPPER_LOCATION}/RadeonProRenderCpp.cpp
     ${RPR_CPP_WRAPPER_LOCATION}/tinyxml2.cpp)
+if(NOT RPR_DISABLE_CUSTOM_MATERIALX_LOADER)
+    target_sources(cpprpr PRIVATE
+        ${RPRMTLXLOADER_LOCATION}/rprMtlxLoader.h
+        ${RPRMTLXLOADER_LOCATION}/rprMtlxLoader.cpp)
+    target_link_libraries(cpprpr PUBLIC MaterialXCore MaterialXFormat)
+    target_compile_definitions(cpprpr PUBLIC -DUSE_CUSTOM_MATERIALX_LOADER)
+endif()
 set_target_properties(cpprpr PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_include_directories(cpprpr PUBLIC ${RPRMTLXLOADER_LOCATION} ${RPR_CPP_WRAPPER_LOCATION})
-target_link_libraries(cpprpr PUBLIC rpr MaterialXCore MaterialXFormat)
+target_link_libraries(cpprpr PUBLIC rpr)
 target_compile_definitions(cpprpr PUBLIC
     RPR_CPPWRAPER_DISABLE_MUTEXLOCK
     RPR_API_USE_HEADER_V2)