HdxRenderTaskParams: adding useAovMultiSample flag and explicitly set…

…ting it for the OIT tasks instead of setting it inside the OIT tasks. (Internal change: 2149248)
PixarAnimationStudios · Feb 19, 2021 · 83aa020 · 83aa020
1 parent 21e9418
commit 83aa020
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 14 deletions.
diff --git a/pxr/imaging/hdx/oitRenderTask.cpp b/pxr/imaging/hdx/oitRenderTask.cpp
@@ -147,9 +147,6 @@ HdxOitRenderTask::Execute(HdTaskContext* ctx)
     renderPassState->SetEnableDepthMask(true);
     renderPassState->SetColorMasks({HdRenderPassState::ColorMaskRGBA});
 
-    // We resolve the AOVs just before rendering any OIT geometry, so
-    // avoid using the multisampled AOVs.
-    renderPassState->SetUseAovMultiSample(false);
     HdxRenderTask::Execute(ctx);
 
     //

diff --git a/pxr/imaging/hdx/oitResolveTask.cpp b/pxr/imaging/hdx/oitResolveTask.cpp
@@ -256,10 +256,6 @@ HdxOitResolveTask::Prepare(HdTaskContext* ctx,
             HdxPackageOitResolveImageShader());
         _renderPassState->SetRenderPassShader(_renderPassShader);
 
-        // We want OIT to resolve into the resolved aov, not the multi sample
-        // aov. See HdxTaskController::GetRenderingTasks().
-        _renderPassState->SetUseAovMultiSample(false);
-
         _renderPass->Prepare(GetRenderTags());
     }
 

diff --git a/pxr/imaging/hdx/oitVolumeRenderTask.cpp b/pxr/imaging/hdx/oitVolumeRenderTask.cpp
@@ -145,11 +145,6 @@ HdxOitVolumeRenderTask::Execute(HdTaskContext* ctx)
     _oitVolumeRenderPassShader->SetCullStyle(
         renderPassState->GetCullStyle());
 
-    // We want OIT to render into the resolve aov, not the multi sample aov.
-    // This assumes a 'resolve' task has been run between rendering the opaque
-    // prims and volume prims. See HdxTaskController::GetRenderingTasks().
-    renderPassState->SetUseAovMultiSample(false);
-
     //
     // Translucent pixels pass
     //

diff --git a/pxr/imaging/hdx/renderSetupTask.cpp b/pxr/imaging/hdx/renderSetupTask.cpp
@@ -175,6 +175,8 @@ HdxRenderSetupTask::SyncParams(HdSceneDelegate* delegate,
 
         if (HdStRenderPassState * const hdStRenderPassState =
                     dynamic_cast<HdStRenderPassState*>(renderPassState.get())) {
+            hdStRenderPassState->SetUseAovMultiSample(
+                params.useAovMultiSample);
             hdStRenderPassState->SetResolveAovMultiSample(
                 params.resolveAovMultiSample);
 
@@ -313,6 +315,7 @@ std::ostream& operator<<(std::ostream& out, const HdxRenderTaskParams& pv)
         << pv.blendConstantColor << " "
         << pv.blendEnable << " "
         << pv.enableAlphaToCoverage << ""
+        << pv.useAovMultiSample << ""
         << pv.resolveAovMultiSample << ""
 
         << pv.camera << " "
@@ -368,6 +371,8 @@ bool operator==(const HdxRenderTaskParams& lhs, const HdxRenderTaskParams& rhs)
            lhs.blendConstantColor       == rhs.blendConstantColor       &&
            lhs.blendEnable              == rhs.blendEnable              &&
            lhs.enableAlphaToCoverage    == rhs.enableAlphaToCoverage    &&
+           lhs.useAovMultiSample        == rhs.useAovMultiSample        &&
+           lhs.resolveAovMultiSample    == rhs.resolveAovMultiSample    &&
 
            lhs.camera                   == rhs.camera                   &&
            lhs.framing                  == rhs.framing                  &&

diff --git a/pxr/imaging/hdx/renderSetupTask.h b/pxr/imaging/hdx/renderSetupTask.h
@@ -175,6 +175,7 @@ struct HdxRenderTaskParams
         , blendConstantColor(0.0f, 0.0f, 0.0f, 0.0f)
         , blendEnable(false)
         , enableAlphaToCoverage(true)
+        , useAovMultiSample(true)
         , resolveAovMultiSample(true)
         // Camera framing and viewer state
         , viewport(0.0)
@@ -242,6 +243,10 @@ struct HdxRenderTaskParams
     // AlphaToCoverage
     bool enableAlphaToCoverage;
 
+    // If true (default), render into the multi-sampled AOVs (rather than
+    // the resolved AOVs).
+    bool useAovMultiSample;
+
     // If true (default), multi-sampled AOVs will be resolved at the end of a
     // render pass.
     bool resolveAovMultiSample;

diff --git a/pxr/imaging/hdx/taskController.cpp b/pxr/imaging/hdx/taskController.cpp
@@ -380,8 +380,14 @@ HdxTaskController::_CreateRenderTask(TfToken const& materialTag)
         GetRenderIndex()->InsertTask<HdxRenderTask>(&_delegate, taskId);
     } else if (materialTag == HdxMaterialTagTokens->translucent) {
         GetRenderIndex()->InsertTask<HdxOitRenderTask>(&_delegate, taskId);
+        // OIT is using its own buffers which are only per pixel and not per
+        // sample. Thus, we resolve the AOVs before starting to render any
+        // OIT geometry and only use the resolved AOVs from then on.
+        renderParams.useAovMultiSample = false;
     } else if (materialTag == HdStMaterialTagTokens->volume) {
         GetRenderIndex()->InsertTask<HdxOitVolumeRenderTask>(&_delegate, taskId);
+        // See above comment about OIT.
+        renderParams.useAovMultiSample = false;
     }
 
     // Create an initial set of render tags in case the user doesn't set any
@@ -452,10 +458,18 @@ HdxTaskController::_SetBlendStateForMaterialTag(TfToken const& materialTag,
 void
 HdxTaskController::_CreateOitResolveTask()
 {
+    HdxRenderTaskParams renderParams;
+    // OIT is using its own buffers which are only per pixel and not per
+    // sample. Thus, we resolve the AOVs before starting to render any
+    // OIT geometry and only use the resolved AOVs from then on.
+    renderParams.useAovMultiSample = false;
+
     _oitResolveTaskId = GetControllerId().AppendChild(_tokens->oitResolveTask);
 
     GetRenderIndex()->InsertTask<HdxOitResolveTask>(&_delegate,
         _oitResolveTaskId);
+
+    _delegate.SetParameter(_oitResolveTaskId, HdTokens->params, renderParams);
 }
 
 void
@@ -960,7 +974,7 @@ HdxTaskController::SetRenderOutputs(TfTokenVector const& outputs)
 
     // Set AOV bindings on render tasks
     for (SdfPath const& renderTaskId : _renderTaskIds) {
-        bool isFirstRenderTask = renderTaskId == _renderTaskIds.front();
+        const bool isFirstRenderTask = renderTaskId == _renderTaskIds.front();
 
         const HdRenderPassAovBindingVector& aovBindings = 
             isFirstRenderTask ? 
@@ -1152,7 +1166,7 @@ HdxTaskController::SetRenderOutputSettings(TfToken const& name,
             _delegate.GetParameter<HdxRenderTaskParams>(
                 renderTaskId, HdTokens->params);
 
-        bool isFirstRenderTask = renderTaskId == _renderTaskIds.front();
+        const bool isFirstRenderTask = renderTaskId == _renderTaskIds.front();
 
         for (size_t i = 0; i < renderParams.aovBindings.size(); ++i) {
             if (renderParams.aovBindings[i].renderBufferId == renderBufferId) {