ReStir (#662)

* restir * hide unused options
GPUOpen-LibrariesAndSDKs · May 5, 2023 · 370c9f9 · 370c9f9
1 parent 7e7576c
commit 370c9f9
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/pxr/imaging/plugin/hdRpr/python/generateRenderSettingFiles.py b/pxr/imaging/plugin/hdRpr/python/generateRenderSettingFiles.py
@@ -415,6 +415,15 @@ def houdini_parm_name(name):
                 'houdini': {
                     'hidewhen': hidewhen_hybrid
                 }
+            },
+            {
+                'name': 'quality:enableReStir',
+                'ui_name': 'Enable ReStir',
+                'help': 'Enable ReStir (HybridPro only)',
+                'defaultValue': True,
+                'houdini': {
+                    'hidewhen': lambda settings: hidewhen_render_quality('!=', 'HybridPro', settings)
+                }
             }
         ]
     },
@@ -448,6 +457,9 @@ def houdini_parm_name(name):
                 'ui_name': 'Downscale Resolution When Interactive',
                 'help': 'Controls whether in interactive mode resolution should be downscaled or no.',
                 'defaultValue': True,
+                'houdini': {
+                    'hidewhen': hidewhen_not_northstar
+                }
             }
         ]
     },

diff --git a/pxr/imaging/plugin/hdRpr/rprApi.cpp b/pxr/imaging/plugin/hdRpr/rprApi.cpp
@@ -2076,6 +2076,16 @@ class HdRprApiImpl {
                 auto radianceClamp = preferences.GetQualityRadianceClamping() == 0 ? std::numeric_limits<float>::max() : preferences.GetQualityRadianceClamping();
                 RPR_ERROR_CHECK(m_rprContext->SetParameter(RPR_CONTEXT_RADIANCE_CLAMP, radianceClamp), "Failed to set radiance clamp");
 
+                if (preferences.GetQualityEnableReStir()) {
+                    RPR_ERROR_CHECK(m_rprContext->SetParameter(rpr::ContextInfo(RPR_CONTEXT_RESERVOIR_SAMPLING), 2), "Failed to set ReStir reservoir sampling");
+                    RPR_ERROR_CHECK(m_rprContext->SetParameter(rpr::ContextInfo(RPR_CONTEXT_RESTIR_SPATIAL_RESAMPLE_ITERATIONS), 3), "Failed to set ReStir resample iterations");
+                    RPR_ERROR_CHECK(m_rprContext->SetParameter(rpr::ContextInfo(RPR_CONTEXT_RESTIR_MAX_RESERVOIRS_PER_CELL), 128), "Failed to set ReStir max reservoirs");
+                }
+                else {
+                    RPR_ERROR_CHECK(m_rprContext->SetParameter(rpr::ContextInfo(RPR_CONTEXT_RESERVOIR_SAMPLING), 0), "Failed to set ReStir reservoir sampling");
+                }
+
+
                 m_dirtyFlags |= ChangeTracker::DirtyScene;
             }
 

diff --git a/pxr/imaging/rprUsd/schema.usda b/pxr/imaging/rprUsd/schema.usda
@@ -233,7 +233,6 @@ class "RprRendererSettingsAPI" (
         rprMaxValue = 1.0
     )
 
-    # not for hybrid
     uniform int rpr:quality:rayDepth = 3 (
         displayName = "Max Ray Depth"
         displayGroup = "Quality"
@@ -299,6 +298,12 @@ class "RprRendererSettingsAPI" (
         rprMinValue = 0.0
         rprMaxValue = 5.0
     )
+
+    # HybridPro only
+    uniform bool rpr:quality:enableReStir = true (
+        displayName = "Enable ReStir (HybridPro only)"
+        displayGroup = "General"
+    )
 
     # not for hybrid
     uniform int rpr:quality:interactive:rayDepth = 2 (
@@ -316,7 +321,7 @@ class "RprRendererSettingsAPI" (
         rprMinValue = 0
         rprMaxValue = 10
     )
-    # tahoe only
+    # northstar only
     uniform bool rpr:quality:interactive:enableDownscale = true (
         displayName = "Enable Downscale"
         displayGroup = "Quality|Interactive"