@@ -49,3 +51,2 @@
 
-  render_task_delegate_->add_aov(pxr::HdAovTokens->color);
-  render_task_delegate_->add_aov(pxr::HdAovTokens->depth);
+  aovs_map_.add_new("Combined", pxr::HdAovTokens->color);

@@ -52,0 +61,4 @@
+    if (aov_token) {
+      render_task_delegate_->add_aov(*aov_token);
+    }
+  }

@@ -24,2 +25,2 @@
-  pxr::HdTaskSharedPtr task();
-  bool is_converged();
+  pxr::HdTaskSharedPtr render_task();
+  bool is_converged(pxr::HdTaskSharedPtr task);

@@ -47,0 +49,4 @@
+  /* Delegate methods */
+  pxr::VtValue Get(pxr::SdfPath const &id, pxr::TfToken const &key) override;
+
+  pxr::HdTaskSharedPtr aov_task();

@@ -30,7 +30,12 @@ class CustomHydraRenderEngine(HydraRenderEngine):
         return {
             'enableTinyPrimCulling': True,
             'maxLights': 8,
+            'aov:Depth': "depth",

@@ -115,3 +113,3 @@
 void Engine::set_render_setting(const std::string &key, const pxr::VtValue &val)
 {
-  render_delegate_->SetRenderSetting(pxr::TfToken(key), val);
+  if (key._Starts_with("aov:")) {

@@ -55,6 +55,7 @@ class Engine {
   std::unique_ptr<BlenderSceneDelegate> hydra_scene_delegate_;
   std::unique_ptr<USDSceneDelegate> usd_scene_delegate_;
 
+  RenderDelegateSettings render_delegate_settings_;

@@ -173,3 +192,3 @@
   }
   else if (aov_key == pxr::HdAovTokens->depth) {
-    format = GPU_DEPTH32F_STENCIL8;
+    format = GPU_DEPTH_COMPONENT32F;

@@ -37,2 +38,2 @@
-  pxr::SdfPath task_id_;
-  pxr::HdxRenderTaskParams task_params_;
+  pxr::SdfPath render_task_id_;
+  pxr::HdxRenderTaskParams render_task_params_;