Update HdRenderPassSharedPtr to use std instead of boost.

(Internal change: 2051755)
PixarAnimationStudios · Mar 30, 2020 · 677978c · 677978c
1 parent 31b7433
commit 677978c
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 23 deletions.
diff --git a/pxr/imaging/hd/engine.h b/pxr/imaging/hd/engine.h
@@ -40,7 +40,7 @@ class HdRenderIndex;
 class HdRenderDelegate;
 class HdResourceRegistry;
 
-typedef boost::shared_ptr<class HdRenderPass> HdRenderPassSharedPtr;
+using HdRenderPassSharedPtr = std::shared_ptr<class HdRenderPass>;
 using HdRenderPassStateSharedPtr = std::shared_ptr<class HdRenderPassState>;
 
 /// \class HdEngine

diff --git a/pxr/imaging/hd/renderDelegate.h b/pxr/imaging/hd/renderDelegate.h
@@ -31,12 +31,10 @@
 #include "pxr/base/vt/dictionary.h"
 #include "pxr/base/tf/token.h"
 
-#include <boost/shared_ptr.hpp>
 #include <memory>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 class SdfPath;
 class HdRprim;
 class HdSprim;
@@ -47,8 +45,7 @@ class HdRenderPass;
 class HdInstancer;
 class HdDriver;
 
-typedef boost::shared_ptr<class HdRenderPass> HdRenderPassSharedPtr;
-
+using HdRenderPassSharedPtr = std::shared_ptr<class HdRenderPass>;
 using HdRenderPassStateSharedPtr = std::shared_ptr<class HdRenderPassState>;
 using HdResourceRegistrySharedPtr = std::shared_ptr<class HdResourceRegistry>;
 using HdDriverVector = std::vector<HdDriver*>;

diff --git a/pxr/imaging/hd/renderPass.h b/pxr/imaging/hd/renderPass.h
@@ -31,8 +31,6 @@
 #include "pxr/imaging/hd/rprimCollection.h"
 #include "pxr/imaging/hd/task.h"
 
-#include <boost/shared_ptr.hpp>
-
 #include <memory>
 
 PXR_NAMESPACE_OPEN_SCOPE
@@ -41,10 +39,9 @@ class HdRenderIndex;
 class HdSceneDelegate;
 
 using HdDirtyListSharedPtr = std::shared_ptr<class HdDirtyList>;
+using HdRenderPassSharedPtr = std::shared_ptr<class HdRenderPass>;
 using HdRenderPassStateSharedPtr = std::shared_ptr<class HdRenderPassState>;
 
-typedef boost::shared_ptr<class HdRenderPass> HdRenderPassSharedPtr;
-
 /// \class HdRenderPass
 ///
 /// An abstract class representing a single render iteration over a set of prims

diff --git a/pxr/imaging/hdSt/imageShaderRenderPass.h b/pxr/imaging/hdSt/imageShaderRenderPass.h
@@ -38,8 +38,8 @@ PXR_NAMESPACE_OPEN_SCOPE
 using HdStResourceRegistrySharedPtr = 
     std::shared_ptr<class HdStResourceRegistry>;
 
-typedef boost::shared_ptr<class HdSt_ImageShaderRenderPass> 
-    HdSt_ImageShaderRenderPassSharedPtr;
+using HdSt_ImageShaderRenderPassSharedPtr =
+    std::shared_ptr<class HdSt_ImageShaderRenderPass>;
 typedef boost::shared_ptr<class HdSt_DrawBatch> 
     HdSt_DrawBatchSharedPtr;
 
@@ -53,7 +53,7 @@ class Hgi;
 /// The benefit of using RenderPassShader is that it participates in codegen.
 /// This means your full-screen shader can use buffers created by other tasks.
 ///
-class HdSt_ImageShaderRenderPass : public HdRenderPass {
+class HdSt_ImageShaderRenderPass final : public HdRenderPass {
 public:
     HDST_API
     HdSt_ImageShaderRenderPass(HdRenderIndex *index, 

diff --git a/pxr/imaging/hdx/oitResolveTask.cpp b/pxr/imaging/hdx/oitResolveTask.cpp
@@ -227,7 +227,7 @@ HdxOitResolveTask::Prepare(HdTaskContext* ctx,
             return;
         }
 
-        _renderPass = boost::make_shared<HdSt_ImageShaderRenderPass>(
+        _renderPass = std::make_shared<HdSt_ImageShaderRenderPass>(
             renderIndex, collection);
 
         // We do not use renderDelegate->CreateRenderPassState because

diff --git a/pxr/imaging/hdx/oitResolveTask.h b/pxr/imaging/hdx/oitResolveTask.h
@@ -40,8 +40,7 @@ class HdSceneDelegate;
 
 using HdStRenderPassStateSharedPtr = std::shared_ptr<class HdStRenderPassState>;
 
-typedef boost::shared_ptr<class HdRenderPass>
-    HdRenderPassSharedPtr;
+using HdRenderPassSharedPtr = std::shared_ptr<class HdRenderPass>;
 typedef boost::shared_ptr<class HdStRenderPassShader>
     HdStRenderPassShaderSharedPtr;
 

diff --git a/pxr/imaging/hdx/renderTask.h b/pxr/imaging/hdx/renderTask.h
@@ -41,7 +41,7 @@ PXR_NAMESPACE_OPEN_SCOPE
 class HdSceneDelegate;
 
 using HdRenderPassStateSharedPtr = std::shared_ptr<class HdRenderPassState>;
-typedef boost::shared_ptr<class HdRenderPass> HdRenderPassSharedPtr;
+using HdRenderPassSharedPtr = std::shared_ptr<class HdRenderPass>;
 typedef boost::shared_ptr<class HdxRenderSetupTask> HdxRenderSetupTaskSharedPtr;
 
 /// \class HdxRenderTask

diff --git a/pxr/imaging/hdx/shadowTask.cpp b/pxr/imaging/hdx/shadowTask.cpp
@@ -144,7 +144,7 @@ HdxShadowTask::Sync(HdSceneDelegate* delegate,
             if (_passes[shadowId]) {
                 _passes[shadowId]->SetRprimCollection(col);
             } else {
-                _passes[shadowId] = boost::make_shared<HdSt_RenderPass>
+                _passes[shadowId] = std::make_shared<HdSt_RenderPass>
                     (&renderIndex, col);
             }
         }

diff --git a/pxr/imaging/hdx/shadowTask.h b/pxr/imaging/hdx/shadowTask.h
@@ -49,9 +49,9 @@ class HdStRenderPassState;
 
 typedef boost::shared_ptr<class HdStRenderPassShader> HdStRenderPassShaderSharedPtr;
 typedef boost::shared_ptr<class HdStShaderCode> HdStShaderCodeSharedPtr;
-typedef boost::shared_ptr<class HdRenderPass> HdRenderPassSharedPtr;
-typedef std::vector<HdRenderPassSharedPtr> HdRenderPassSharedPtrVector;
 
+using HdRenderPassSharedPtr = std::shared_ptr<class HdRenderPass>;
+using HdRenderPassSharedPtrVector = std::vector<HdRenderPassSharedPtr>;
 using HdRenderPassStateSharedPtr = std::shared_ptr<class HdRenderPassState>;
 using HdRenderPassStateSharedPtrVector = 
     std::vector<HdRenderPassStateSharedPtr>;

diff --git a/pxr/imaging/hdx/simpleLightTask.h b/pxr/imaging/hdx/simpleLightTask.h
@@ -40,12 +40,14 @@
 
 #include <boost/shared_ptr.hpp>
 
+#include <memory>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 class HdRenderIndex;
 class HdSceneDelegate;
 
-typedef boost::shared_ptr<class HdRenderPass> HdRenderPassSharedPtr;
+using HdRenderPassSharedPtr = std::shared_ptr<class HdRenderPass>;
 typedef boost::shared_ptr<class HdStSimpleLightingShader> 
     HdStSimpleLightingShaderSharedPtr;
 typedef boost::shared_ptr<class HdxShadowMatrixComputation> 

diff --git a/pxr/usdImaging/usdImaging/unitTestHelper.h b/pxr/usdImaging/usdImaging/unitTestHelper.h
@@ -39,13 +39,12 @@
 #include "pxr/imaging/hd/unitTestNullRenderDelegate.h"
 #include "pxr/imaging/hd/unitTestNullRenderPass.h"
 
+#include <memory>
 #include <string>
-#include <boost/shared_ptr.hpp>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
-typedef boost::shared_ptr<HdRenderPass> HdRenderPassSharedPtr;
+using HdRenderPassSharedPtr = std::shared_ptr<HdRenderPass>;
 
 /// A simple test task that just causes sync processing
 class UsdImaging_TestTask final : public HdTask