From 677978c6d952a20140e1d0ec1d93e14b9c307e67 Mon Sep 17 00:00:00 2001 From: c64kernal Date: Mon, 30 Mar 2020 12:03:37 -0700 Subject: [PATCH] Update HdRenderPassSharedPtr to use std instead of boost. (Internal change: 2051755) --- pxr/imaging/hd/engine.h | 2 +- pxr/imaging/hd/renderDelegate.h | 5 +---- pxr/imaging/hd/renderPass.h | 5 +---- pxr/imaging/hdSt/imageShaderRenderPass.h | 6 +++--- pxr/imaging/hdx/oitResolveTask.cpp | 2 +- pxr/imaging/hdx/oitResolveTask.h | 3 +-- pxr/imaging/hdx/renderTask.h | 2 +- pxr/imaging/hdx/shadowTask.cpp | 2 +- pxr/imaging/hdx/shadowTask.h | 4 ++-- pxr/imaging/hdx/simpleLightTask.h | 4 +++- pxr/usdImaging/usdImaging/unitTestHelper.h | 5 ++--- 11 files changed, 17 insertions(+), 23 deletions(-) diff --git a/pxr/imaging/hd/engine.h b/pxr/imaging/hd/engine.h index accde015f2..9a9241a951 100644 --- 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 HdRenderPassSharedPtr; +using HdRenderPassSharedPtr = std::shared_ptr; using HdRenderPassStateSharedPtr = std::shared_ptr; /// \class HdEngine diff --git a/pxr/imaging/hd/renderDelegate.h b/pxr/imaging/hd/renderDelegate.h index 88c28580e3..09b5a41f00 100644 --- 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 #include PXR_NAMESPACE_OPEN_SCOPE - class SdfPath; class HdRprim; class HdSprim; @@ -47,8 +45,7 @@ class HdRenderPass; class HdInstancer; class HdDriver; -typedef boost::shared_ptr HdRenderPassSharedPtr; - +using HdRenderPassSharedPtr = std::shared_ptr; using HdRenderPassStateSharedPtr = std::shared_ptr; using HdResourceRegistrySharedPtr = std::shared_ptr; using HdDriverVector = std::vector; diff --git a/pxr/imaging/hd/renderPass.h b/pxr/imaging/hd/renderPass.h index 189b08c66e..e7e6d57a42 100644 --- 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 - #include PXR_NAMESPACE_OPEN_SCOPE @@ -41,10 +39,9 @@ class HdRenderIndex; class HdSceneDelegate; using HdDirtyListSharedPtr = std::shared_ptr; +using HdRenderPassSharedPtr = std::shared_ptr; using HdRenderPassStateSharedPtr = std::shared_ptr; -typedef boost::shared_ptr 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 index 5fd3f3590d..3979088c9c 100644 --- 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; -typedef boost::shared_ptr - HdSt_ImageShaderRenderPassSharedPtr; +using HdSt_ImageShaderRenderPassSharedPtr = + std::shared_ptr; typedef boost::shared_ptr 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 index 956b45efbf..8929f922b6 100644 --- 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( + _renderPass = std::make_shared( renderIndex, collection); // We do not use renderDelegate->CreateRenderPassState because diff --git a/pxr/imaging/hdx/oitResolveTask.h b/pxr/imaging/hdx/oitResolveTask.h index 1bbf245b0d..b62f4c1c72 100644 --- a/pxr/imaging/hdx/oitResolveTask.h +++ b/pxr/imaging/hdx/oitResolveTask.h @@ -40,8 +40,7 @@ class HdSceneDelegate; using HdStRenderPassStateSharedPtr = std::shared_ptr; -typedef boost::shared_ptr - HdRenderPassSharedPtr; +using HdRenderPassSharedPtr = std::shared_ptr; typedef boost::shared_ptr HdStRenderPassShaderSharedPtr; diff --git a/pxr/imaging/hdx/renderTask.h b/pxr/imaging/hdx/renderTask.h index ad5e86641d..f540bd67cc 100644 --- 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; -typedef boost::shared_ptr HdRenderPassSharedPtr; +using HdRenderPassSharedPtr = std::shared_ptr; typedef boost::shared_ptr HdxRenderSetupTaskSharedPtr; /// \class HdxRenderTask diff --git a/pxr/imaging/hdx/shadowTask.cpp b/pxr/imaging/hdx/shadowTask.cpp index 910b070653..6c8ecc5185 100644 --- 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 + _passes[shadowId] = std::make_shared (&renderIndex, col); } } diff --git a/pxr/imaging/hdx/shadowTask.h b/pxr/imaging/hdx/shadowTask.h index c8cba057da..71fcac8558 100644 --- a/pxr/imaging/hdx/shadowTask.h +++ b/pxr/imaging/hdx/shadowTask.h @@ -49,9 +49,9 @@ class HdStRenderPassState; typedef boost::shared_ptr HdStRenderPassShaderSharedPtr; typedef boost::shared_ptr HdStShaderCodeSharedPtr; -typedef boost::shared_ptr HdRenderPassSharedPtr; -typedef std::vector HdRenderPassSharedPtrVector; +using HdRenderPassSharedPtr = std::shared_ptr; +using HdRenderPassSharedPtrVector = std::vector; using HdRenderPassStateSharedPtr = std::shared_ptr; using HdRenderPassStateSharedPtrVector = std::vector; diff --git a/pxr/imaging/hdx/simpleLightTask.h b/pxr/imaging/hdx/simpleLightTask.h index a72dea6b8f..d342ce5e37 100644 --- a/pxr/imaging/hdx/simpleLightTask.h +++ b/pxr/imaging/hdx/simpleLightTask.h @@ -40,12 +40,14 @@ #include +#include + PXR_NAMESPACE_OPEN_SCOPE class HdRenderIndex; class HdSceneDelegate; -typedef boost::shared_ptr HdRenderPassSharedPtr; +using HdRenderPassSharedPtr = std::shared_ptr; typedef boost::shared_ptr HdStSimpleLightingShaderSharedPtr; typedef boost::shared_ptr diff --git a/pxr/usdImaging/usdImaging/unitTestHelper.h b/pxr/usdImaging/usdImaging/unitTestHelper.h index 08d4ed87bc..54dcb94c00 100644 --- 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 #include -#include PXR_NAMESPACE_OPEN_SCOPE - -typedef boost::shared_ptr HdRenderPassSharedPtr; +using HdRenderPassSharedPtr = std::shared_ptr; /// A simple test task that just causes sync processing class UsdImaging_TestTask final : public HdTask