Change render delegates to use std::make_shared.

When constructing the resource registry, use std::make_shared when creating a resource registry. (Internal change: 2051715) (Internal change: 2051901)
hughes123b · Mar 30, 2020 · 7da2486 · 7da2486
1 parent 547cad3
commit 7da2486
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/extras/imaging/examples/hdTiny/renderDelegate.cpp b/extras/imaging/examples/hdTiny/renderDelegate.cpp
@@ -59,7 +59,7 @@ void
 HdTinyRenderDelegate::_Initialize()
 {
     std::cout << "Creating Tiny RenderDelegate" << std::endl;
-    _resourceRegistry.reset(new HdResourceRegistry());
+    _resourceRegistry = std::make_shared<HdResourceRegistry>();
 }
 
 HdTinyRenderDelegate::~HdTinyRenderDelegate()

diff --git a/pxr/imaging/hdSt/renderDelegate.cpp b/pxr/imaging/hdSt/renderDelegate.cpp
@@ -126,7 +126,7 @@ HdStRenderDelegate::_Initialize()
     std::lock_guard<std::mutex> guard(_mutexResourceRegistry);
 
     if (_counterResourceRegistry.fetch_add(1) == 0) {
-        _resourceRegistry.reset( new HdStResourceRegistry() );
+        _resourceRegistry = std::make_shared<HdStResourceRegistry>();
         HdPerfLog::GetInstance().AddResourceRegistry(_resourceRegistry);
     }
 

diff --git a/pxr/imaging/plugin/hdEmbree/renderDelegate.cpp b/pxr/imaging/plugin/hdEmbree/renderDelegate.cpp
@@ -176,7 +176,7 @@ HdEmbreeRenderDelegate::_Initialize()
     std::lock_guard<std::mutex> guard(_mutexResourceRegistry);
 
     if (_counterResourceRegistry.fetch_add(1) == 0) {
-        _resourceRegistry.reset( new HdResourceRegistry() );
+        _resourceRegistry = std::make_shared<HdResourceRegistry>();
     }
 }
 

diff --git a/third_party/renderman-22/plugin/hdPrman/renderDelegate.cpp b/third_party/renderman-22/plugin/hdPrman/renderDelegate.cpp
@@ -110,7 +110,7 @@ void
 HdPrmanRenderDelegate::_Initialize()
 {
     _renderParam = std::make_shared<HdPrman_RenderParam>(_context);
-    _resourceRegistry.reset(new HdResourceRegistry());
+    _resourceRegistry = std::make_shared<HdResourceRegistry>();
 
     std::string integrator = HdPrmanIntegratorTokens->PxrPathTracer;
     const std::string interactiveIntegrator = 

diff --git a/third_party/renderman-23/plugin/hdPrman/renderDelegate.cpp b/third_party/renderman-23/plugin/hdPrman/renderDelegate.cpp
@@ -104,7 +104,7 @@ HdPrmanRenderDelegate::_Initialize()
 
     // Initialize default resource registry. HdxPrman may override this with its
     // resource registry during HdxPrmanRenderDelegate::_Initialize.
-    _resourceRegistry.reset(new HdResourceRegistry());
+    _resourceRegistry = std::make_shared<HdResourceRegistry>();
 
     std::string integrator = HdPrmanIntegratorTokens->PxrPathTracer;
     const std::string interactiveIntegrator =