Autodesk · lanierd-adsk · Jul 28, 2026 · Feb 27, 2026 · Feb 27, 2026 · Mar 2, 2026
diff --git a/cmake/modules/FindUSD.cmake b/cmake/modules/FindUSD.cmake
@@ -158,5 +158,16 @@ find_program(OIIO_idiff_BINARY
     PATH_SUFFIXES
         bin/
     DOC
-        "OIIO's idiff binary"  
-)
+        "OIIO's idiff binary"
+)
+
+find_program(OIIO_oiiotool_BINARY
+        oiiotool
+    HINTS
+        ${PXR_USD_LOCATION}
+        $ENV{PXR_USD_LOCATION}
+    PATH_SUFFIXES
+        bin/
+    DOC
+        "OIIO's oiiotool binary (for diff images)"
+)
diff --git a/cmake/test.cmake b/cmake/test.cmake
diff --git a/doc/build.md b/doc/build.md
@@ -242,7 +242,19 @@ CMAKE_SKIP_RPATH=TRUE
 ```
 To allow your tests to run, you can inject LD_LIBRARY_PATH into any of the mayaHydra_add_test calls by setting the ADDITIONAL_LD_LIBRARY_PATH cmake variable to $ENV{LD_LIBRARY_PATH} or similar.
 
-There is a related ADDITIONAL_PXR_PLUGINPATH_NAME cmake var which can be used if schemas are installed in a non-standard location
+There is a related `ADDITIONAL_PXR_PLUGINPATH_NAME` CMake variable which appends paths to `PXR_PLUGINPATH_NAME` for tests. Use it when Hydra render delegate plugins (e.g. HdArnold) are installed in a non-standard location:
+
+```
+cmake -DADDITIONAL_PXR_PLUGINPATH_NAME="C:/path/to/arnold-usd/install/plugin" ...
+```
+
+The same variable can be set in the environment before running CMake (e.g. from a build pipeline) so the path is picked up automatically.
+
+**Arnold (MtoA):** When `MTOA_LOCATION` and `USD_VERSION` are defined, the HdArnold plugin path is added only if `plugInfo.json` is found: `${MTOA_LOCATION}/usd/bundle/<version>` (newer Arnold) is tried first, then `${MTOA_LOCATION}/usd/hydra/<version>` (older).
+
+**RenderMan (PRMan):** For HdPrman tests, provide the RenderMan locations via CMake cache variables (`-DRMANTREE=...`, `-DRENDERMAN_LOCATION=...` (optional), `-DPIXAR_LICENSE_FILE=...` (license server, format: `port@hostname`), `-DPRMAN_DELEGATE_PLUGIN_PATH=...` (path containing HdPrman `plugInfo.json`)) or via environment variables of the same names. CMake variables take precedence. On Windows, the test harness adds `${RMANTREE}/bin` and `${RMANTREE}/lib` to `PATH` when `RMANTREE` is set.
+
+**Local development:** If `PXR_PLUGINPATH_NAME` or `MAYA_PXR_PLUGINPATH_NAME` is set in your environment when you run CMake, those paths are automatically appended to the test environment. This allows locally-installed Hydra plugins (e.g. HdArnold, HdPrman) to be discovered when running tests. On Windows, use forward slashes or escaped backslashes in the path.
 
 ### Using Visual Studio as the generator
 

diff --git a/lib/mayaHydra/flowViewportAPIExamples/customNodeTranslationSceneIndex/CMakeLists.txt b/lib/mayaHydra/flowViewportAPIExamples/customNodeTranslationSceneIndex/CMakeLists.txt
@@ -63,21 +63,21 @@ target_link_libraries(${TARGET_NAME}
 # -----------------------------------------------------------------------------
 # run-time search paths
 # -----------------------------------------------------------------------------
-if(IS_MACOSX OR IS_LINUX) 
-    mayaUsd_init_rpath(rpath "lib/maya")
-    if(DEFINED MAYAUSD_TO_USD_RELATIVE_PATH)
-        mayaUsd_add_rpath(rpath "../../${MAYAUSD_TO_USD_RELATIVE_PATH}/lib")
+if(IS_MACOSX OR IS_LINUX)
+    # This plugin is installed to lib/usd/customNodeTranslationSceneIndex/, so
+    # the rpath origin must match that install path (not lib/maya/).
+    mayaUsd_init_rpath(rpath "lib/usd/customNodeTranslationSceneIndex")
+    if(DEFINED MAYAHYDRA_TO_USD_RELATIVE_PATH)
+        mayaUsd_add_rpath(rpath "../../../${MAYAHYDRA_TO_USD_RELATIVE_PATH}/lib")
         if (IS_LINUX)
-            mayaUsd_add_rpath(rpath "../../${MAYAUSD_TO_USD_RELATIVE_PATH}/lib64")
+            mayaUsd_add_rpath(rpath "../../../${MAYAHYDRA_TO_USD_RELATIVE_PATH}/lib64")
         endif()
         if(IS_MACOSX)
-            mayaUsd_add_rpath(rpath "../../../../Maya.app/Contents/MacOS")
+            mayaUsd_add_rpath(rpath "../../../../../Maya.app/Contents/MacOS")
         endif()
     elseif(DEFINED PXR_USD_LOCATION)
         mayaUsd_add_rpath(rpath "${PXR_USD_LOCATION}/lib")
     endif()
-
-    mayaUsd_add_rpath(rpath "../")
     mayaUsd_install_rpath(rpath ${TARGET_NAME})
 endif()
 

diff --git a/lib/mayaHydra/flowViewportAPIExamples/simpleHydraGenerativeProceduralPlugin/CMakeLists.txt b/lib/mayaHydra/flowViewportAPIExamples/simpleHydraGenerativeProceduralPlugin/CMakeLists.txt
@@ -66,21 +66,21 @@ target_link_libraries(${TARGET_NAME}
 # -----------------------------------------------------------------------------
 # run-time search paths
 # -----------------------------------------------------------------------------
-if(IS_MACOSX OR IS_LINUX) 
-    mayaUsd_init_rpath(rpath "lib/maya")
-    if(DEFINED MAYAUSD_TO_USD_RELATIVE_PATH)
-        mayaUsd_add_rpath(rpath "../../${MAYAUSD_TO_USD_RELATIVE_PATH}/lib")
+if(IS_MACOSX OR IS_LINUX)
+    # This plugin is installed to lib/usd/simpleHydraGenerativeProcedural/, so
+    # the rpath origin must match that install path (not lib/maya/).
+    mayaUsd_init_rpath(rpath "lib/usd/simpleHydraGenerativeProcedural")
+    if(DEFINED MAYAHYDRA_TO_USD_RELATIVE_PATH)
+        mayaUsd_add_rpath(rpath "../../../${MAYAHYDRA_TO_USD_RELATIVE_PATH}/lib")
         if (IS_LINUX)
-            mayaUsd_add_rpath(rpath "../../${MAYAUSD_TO_USD_RELATIVE_PATH}/lib64")
+            mayaUsd_add_rpath(rpath "../../../${MAYAHYDRA_TO_USD_RELATIVE_PATH}/lib64")
         endif()
         if(IS_MACOSX)
-            mayaUsd_add_rpath(rpath "../../../../Maya.app/Contents/MacOS")
+            mayaUsd_add_rpath(rpath "../../../../../Maya.app/Contents/MacOS")
         endif()
     elseif(DEFINED PXR_USD_LOCATION)
         mayaUsd_add_rpath(rpath "${PXR_USD_LOCATION}/lib")
     endif()
-
-    mayaUsd_add_rpath(rpath "../")
     mayaUsd_install_rpath(rpath ${TARGET_NAME})
 endif()
 

diff --git a/lib/mayaHydra/hydraExtensions/adapters/cameraAdapter.cpp b/lib/mayaHydra/hydraExtensions/adapters/cameraAdapter.cpp
@@ -239,6 +239,12 @@ VtValue MayaHydraCameraAdapter::GetCameraParamValue(const TfToken& paramName)
         return {};
     }
 
+    // clippingRange is required for all cameras (ortho and perspective)
+    if (paramName == HdCameraTokens->clippingRange) {
+        const double cameraNear = camera.nearClippingPlane();
+        const double cameraFar = camera.farClippingPlane();
+        return VtValue(GfRange1f(float(cameraNear), float(cameraFar)));
+    }
     if (paramName == HdCameraTokens->shutterOpen) {
         // No motion samples, instantaneous shutter
         if (!GetMayaHydraSceneIndex()->GetParams().motionSamplesEnabled())
@@ -274,11 +280,6 @@ VtValue MayaHydraCameraAdapter::GetCameraParamValue(const TfToken& paramName)
             return {};
         return VtValue(float(focalLength)); /// focalLength is in mm, so no conversion needed
     }
-    if (paramName == HdCameraTokens->clippingRange) {
-        const double cameraNear = camera.nearClippingPlane();
-        const double cameraFar = camera.farClippingPlane();
-        return VtValue(GfRange1f(cameraNear, cameraFar));
-    }
     if (paramName == HdCameraTokens->fStop) {
         // For USD/Hydra fStop=0 should disable depthOfField
         if (!camera.isDepthOfField())

diff --git a/lib/mayaHydra/mayaPlugin/pluginUtils.cpp b/lib/mayaHydra/mayaPlugin/pluginUtils.cpp
@@ -88,27 +88,26 @@ MtohInitializeRenderPlugins()
             }
 
 #if HD_API_VERSION >= 98 // PXR_VERSION > 2605
-            HdRenderDelegate* delegate
-                = plugin->IsSupported(HdRendererCreateArgsSchema(nullptr)) ? 
-                    plugin->CreateRenderDelegate() : nullptr;
+            if (!plugin->IsSupported(HdRendererCreateArgsSchema(nullptr))) {
+                continue;
+            }
 #else
-            HdRenderDelegate* delegate
-                = plugin->IsSupported() ? plugin->CreateRenderDelegate() : nullptr;
-#endif
-
-            // No 'delete plugin', should plugin be cached as well?
-            if (!delegate) {
+            if (!plugin->IsSupported()) {
                 continue;
             }
+#endif
 
-            auto& rendererSettingDescriptors
-                = store.second.emplace(renderer, delegate->GetRenderSettingDescriptors())
-                      .first->second;
+            // CreateRenderDelegate may fail without GPU context (e.g. Arnold from
+            // PXR_PLUGINPATH_NAME). Still register the override; delegate is created
+            // at render time. Use empty settings when delegate creation fails.
+            HdRenderDelegate* delegate = plugin->CreateRenderDelegate();
+            HdRenderSettingDescriptorList rendererSettingDescriptors;
+            if (delegate) {
+                rendererSettingDescriptors = delegate->GetRenderSettingDescriptors();
+                plugin->DeleteRenderDelegate(delegate);
+            }
 
-            // We only needed the delegate for the settings, so release
-            plugin->DeleteRenderDelegate(delegate);
-            // Null it out to make any possible usage later obv, wrong!
-            delegate = nullptr;
+            auto& settingDescriptors = store.second.emplace(renderer, std::move(rendererSettingDescriptors)).first->second;
 
             store.first.emplace_back(
                 renderer,
@@ -118,7 +117,7 @@ MtohInitializeRenderPlugins()
                     "%sHydra %s",
                     TECHNOLOGY_PREVIEW_PREFIX,
                     PXR_NS::UsdImagingGLEngine::GetRendererDisplayName(pluginDesc.id).c_str())));
-            MtohRenderGlobals::BuildOptionsMenu(store.first.back(), rendererSettingDescriptors);
+            MtohRenderGlobals::BuildOptionsMenu(store.first.back(), settingDescriptors);
         }
 
         // Make sure the static's size doesn't have any extra overhead

diff --git a/lib/mayaHydra/mayaPlugin/renderOverride.cpp b/lib/mayaHydra/mayaPlugin/renderOverride.cpp
@@ -98,6 +98,7 @@
 #include <pxr/imaging/glf/contextCaps.h>
 #include <pxr/imaging/hd/camera.h>
 #include <pxr/imaging/hd/rendererPluginRegistry.h>
+#include <pxr/imaging/hd/renderBuffer.h>
 #include <pxr/imaging/hd/rprim.h>
 #include <pxr/imaging/hd/sceneIndexPluginRegistry.h>
 #include <pxr/imaging/hd/dataSource.h>
@@ -990,10 +991,9 @@ MStatus MtohRenderOverride::Render(
                                  fileName.c_str());
             }
         }
-
-        // Check if all passes are converged
-        // Only iterate over visible passes
-        _isConverged = true; 
+
+        // Check convergence from the tasks first
+        _isConverged = true;
         for (int visibleIdx = 0; visibleIdx < numVisibleFramePasses; ++visibleIdx) {
             const int i = framePassesVisible[visibleIdx]; // Get the actual pass index
             const hvt::FramePassPtr& currentPass = _GetFramePass(i);
@@ -1007,6 +1007,55 @@ MStatus MtohRenderOverride::Render(
             }
         }
 
+        if (!_isConverged) {
+            // Check with AOVs as a second step, as some renderers may not properly set convergence
+            // on the tasks
+            // Check if all AOVs are converged for each visible pass.
+            // Get the AOVs and check each render buffer's IsConverged().
+            // Note: For Arnold, _taskController->IsConverged() always returns false; we must check
+            // each AOV buffer directly.
+            auto isConverged = [this, &framePassesVisible, numVisibleFramePasses]() {
+                for (int visibleIdx = 0; visibleIdx < numVisibleFramePasses; ++visibleIdx) {
+                    const int                i = framePassesVisible[visibleIdx];
+                    const hvt::FramePassPtr& currentPass = _GetFramePass(i);
+                    if (!currentPass) {
+                        continue;
+                    }
+
+                    const auto* bufferManager = currentPass->GetRenderBufferManager().get();
+                    if (!bufferManager) {
+                        return false;
+                    }
+
+                    TfTokenVector renderOutputs = bufferManager->GetRenderOutputs();
+                    if (renderOutputs.empty()) {
+                        renderOutputs = GetAvailableFramePassAovs(i);
+                    }
+                    if (renderOutputs.empty()) {
+                        TF_DEBUG(MAYAHYDRALIB_RENDEROVERRIDE_RENDER)
+                            .Msg("RenderOutputs list is empty; assuming not converged.\n");
+                        return false;
+                    }
+
+                    for (const TfToken& aovToken : renderOutputs) {
+                        HdRenderBuffer* buffer = currentPass->GetRenderBuffer(aovToken);
+                        if (!buffer) {
+                            TF_DEBUG(MAYAHYDRALIB_RENDEROVERRIDE_RENDER)
+                                .Msg("Render output '%s' not found; assuming not converged.\n",
+                                     aovToken.GetText());
+                            return false;
+                        }
+                        if (!buffer->IsConverged()) {
+                            return false;
+                        }
+                    }
+                }
+                return true;
+            };
+
+            _isConverged = isConverged();
+        }
+
         if (markTime) {
             std::lock_guard<std::mutex> lock(_lastRenderTimeMutex);
             _lastRenderTime = std::chrono::system_clock::now();

diff --git a/test/lib/cmdLineRender/CMakeLists.txt b/test/lib/cmdLineRender/CMakeLists.txt
@@ -163,6 +163,8 @@ if(NOT IS_MACOSX)
     )
 endif()
 
+# Arnold cmdLine render does not produce output images on macOS. Tracked as HYDRA-2262.
+if(NOT IS_MACOSX)
 mayaHydra_add_cmd_line_render_multi_image_test(renderSettings/AnimCubeRenderSettings.ma
     RENDERER HdArnoldRendererPlugin
     EXPECTED_IMAGES_DIR renderSettings/images/arnold
@@ -171,6 +173,7 @@ mayaHydra_add_cmd_line_render_multi_image_test(renderSettings/AnimCubeRenderSett
     FAIL 0.05
     FAILPERCENT 1.0
 )
+endif()
 
 # Stage UVChecker.png within this test’s temporary Maya project so it can be
 # resolved via the workspace root when using `-proj`.

diff --git a/test/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt b/test/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt
@@ -36,8 +36,7 @@ set(INTERACTIVE_TEST_SCRIPT_FILES
 	testMaterialXOnNative.py|depOnPlugins:lookdevx
     testArnoldLights.py|depOnPlugins:mtoa
 	testMayaLightingModes.py|depOnPlugins:mtoa
-    # Failing, HYDRA-2031.
-	# testLightingByRenderDelegate.py|depOnPlugins:mtoa
+    testLightingRenderDelegates.py|depOnPlugins:prman|skipOnPlatform:osx # HYDRA-2209: re-enable on OSX
 	testBifrostGraphUpdate.py|depOnPlugins:bifrost
 	#End of tests that have a dependency on other plugins
     testLookThrough.py
@@ -164,7 +163,7 @@ set(INTERACTIVE_TEST_SCRIPT_FILES_MESH_ADAPTER
 # on computations made by VP2 for its use.  Entered as HYDRA-1961.
 set(INTERACTIVE_TEST_SCRIPT_FILES_ENABLE_VP2_RENDER_DELEGATE
 	testViewportFilters.py|depOnPlugins:mtoa
-    testFlowPluginsHierarchicalProperties.py
+    testFlowPluginsHierarchicalProperties.py|skipOnPlatform:osx # HYDRA-2209: BasisCurvesLinearDomain fragment errors on OSX
     testBoundingBox.py
 	#Disabled tests on OSX
 	testDataProducerSelHighlight.py|skipOnPlatform:osx # HYDRA-1127 : refinedWire not working on OSX
@@ -242,5 +241,21 @@ foreach(script ${INTERACTIVE_TEST_SCRIPT_FILES})
 
 endforeach()
 
+# Standalone Python unit tests for pure test utilities. These exercise logic
+# that does not need Maya (e.g. renderManUtils env/platform gating), so they run
+# under mayapy via unittest without initializing a standalone Maya session.
+set(PYTHON_UNIT_TEST_MODULES
+    testRenderManUtils.py
+)
+foreach(script ${PYTHON_UNIT_TEST_MODULES})
+    get_testfile_and_labels(all_labels test_filename ${script})
+    mayaUsd_get_unittest_target(target ${test_filename})
+    mayaUsd_add_test(${target}
+        PYTHON_MODULE ${target}
+        NO_STANDALONE_INIT
+    )
+    apply_labels_to_test("${all_labels}" ${target})
+endforeach()
+
 # C++ unit tests
 add_subdirectory(cpp)
diff --git a/...lib/mayaUsd/render/mayaToHydra/LightingRenderDelegatesTest/PRMan_areaLight1.png b/...lib/mayaUsd/render/mayaToHydra/LightingRenderDelegatesTest/PRMan_areaLight1.png
diff --git a/...aUsd/render/mayaToHydra/LightingRenderDelegatesTest/PRMan_directionalLight1.png b/...aUsd/render/mayaToHydra/LightingRenderDelegatesTest/PRMan_directionalLight1.png
diff --git a/...ib/mayaUsd/render/mayaToHydra/LightingRenderDelegatesTest/PRMan_pointLight1.png b/...ib/mayaUsd/render/mayaToHydra/LightingRenderDelegatesTest/PRMan_pointLight1.png
diff --git a/...lib/mayaUsd/render/mayaToHydra/LightingRenderDelegatesTest/PRMan_spotLight1.png b/...lib/mayaUsd/render/mayaToHydra/LightingRenderDelegatesTest/PRMan_spotLight1.png
diff --git a/...lib/mayaUsd/render/mayaToHydra/LightingRenderDelegatesTest/Storm_areaLight1.png b/...lib/mayaUsd/render/mayaToHydra/LightingRenderDelegatesTest/Storm_areaLight1.png
diff --git a/...aUsd/render/mayaToHydra/LightingRenderDelegatesTest/Storm_directionalLight1.png b/...aUsd/render/mayaToHydra/LightingRenderDelegatesTest/Storm_directionalLight1.png
diff --git a/...ib/mayaUsd/render/mayaToHydra/LightingRenderDelegatesTest/Storm_pointLight1.png b/...ib/mayaUsd/render/mayaToHydra/LightingRenderDelegatesTest/Storm_pointLight1.png
diff --git a/...lib/mayaUsd/render/mayaToHydra/LightingRenderDelegatesTest/Storm_spotLight1.png b/...lib/mayaUsd/render/mayaToHydra/LightingRenderDelegatesTest/Storm_spotLight1.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/testFlowPluginsHierarchicalProperties.py b/test/lib/mayaUsd/render/mayaToHydra/testFlowPluginsHierarchicalProperties.py
@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+import platform
 import maya.cmds as cmds
 import fixturesUtils
 import mtohUtils
@@ -27,6 +28,14 @@ class TestFlowPluginsHierarchicalProperties(mtohUtils.MayaHydraBaseTestCase):
 
     IMAGE_DIFF_FAIL_THRESHOLD = 0.05
     IMAGE_DIFF_FAIL_PERCENT = 1
+    IMAGE_DIFF_FAIL_PERCENT_OSX = 3.0
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestFlowPluginsHierarchicalProperties, cls).setUpClass()
+        if platform.system() == "Darwin":
+            # Metal produces slightly different silhouettes on macOS.
+            cls.IMAGE_DIFF_FAIL_PERCENT = cls.IMAGE_DIFF_FAIL_PERCENT_OSX
 
     def keyframeAttribute(self, object, attr, value):
         cmds.setAttr(object + "." + attr, value)