Rename D3D11::D3D11RenderTargetView to D3D11::RenderTargetView

OpenKneeboard · Aug 28, 2022 · 2587c5c · 2587c5c
1 parent b66acd1
commit 2587c5c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 18 deletions.
diff --git a/src/injectables/OculusD3D11Kneeboard.cpp b/src/injectables/OculusD3D11Kneeboard.cpp
@@ -90,9 +90,8 @@ ovrTextureSwapChain OculusD3D11Kneeboard::CreateSwapChain(
     ovr->ovr_GetTextureSwapChainBufferDX(
       session, swapChain, i, IID_PPV_ARGS(texture.put()));
 
-    layerRenderTargets.at(i)
-      = std::make_shared<D3D11::D3D11RenderTargetViewFactory>(
-        mD3D.get(), texture.get());
+    layerRenderTargets.at(i) = std::make_shared<D3D11::RenderTargetViewFactory>(
+      mD3D.get(), texture.get());
   }
 
   return swapChain;

diff --git a/src/injectables/OpenXRD3D11Kneeboard.cpp b/src/injectables/OpenXRD3D11Kneeboard.cpp
@@ -115,7 +115,7 @@ XrSwapchain OpenXRD3D11Kneeboard::CreateSwapChain(
     }
 #endif
     mRenderTargetViews.at(layerIndex).at(i)
-      = std::make_shared<D3D11::D3D11RenderTargetViewFactory>(
+      = std::make_shared<D3D11::RenderTargetViewFactory>(
         mDevice, images.at(i).texture);
   }
 

diff --git a/src/lib/D3D11.cpp b/src/lib/D3D11.cpp
@@ -105,18 +105,18 @@ IRenderTargetView::IRenderTargetView() = default;
 IRenderTargetView::~IRenderTargetView() = default;
 IRenderTargetViewFactory::~IRenderTargetViewFactory() = default;
 
-D3D11RenderTargetView::D3D11RenderTargetView(
+RenderTargetView::RenderTargetView(
   const winrt::com_ptr<ID3D11RenderTargetView>& impl)
   : mImpl(impl) {
 }
 
-D3D11RenderTargetView::~D3D11RenderTargetView() = default;
+RenderTargetView::~RenderTargetView() = default;
 
-ID3D11RenderTargetView* D3D11RenderTargetView::Get() const {
+ID3D11RenderTargetView* RenderTargetView::Get() const {
   return mImpl.get();
 }
 
-D3D11RenderTargetViewFactory::D3D11RenderTargetViewFactory(
+RenderTargetViewFactory::RenderTargetViewFactory(
   ID3D11Device* device,
   ID3D11Texture2D* texture) {
   D3D11_RENDER_TARGET_VIEW_DESC rtvd {
@@ -129,10 +129,10 @@ D3D11RenderTargetViewFactory::D3D11RenderTargetViewFactory(
     device->CreateRenderTargetView(texture, &rtvd, mImpl.put()));
 }
 
-D3D11RenderTargetViewFactory::~D3D11RenderTargetViewFactory() = default;
+RenderTargetViewFactory::~RenderTargetViewFactory() = default;
 
-std::unique_ptr<IRenderTargetView> D3D11RenderTargetViewFactory::Get() const {
-  return std::make_unique<D3D11RenderTargetView>(mImpl);
+std::unique_ptr<IRenderTargetView> RenderTargetViewFactory::Get() const {
+  return std::make_unique<RenderTargetView>(mImpl);
 }
 
 }// namespace OpenKneeboard::D3D11
diff --git a/src/lib/include/OpenKneeboard/D3D11.h b/src/lib/include/OpenKneeboard/D3D11.h
@@ -74,22 +74,22 @@ class IRenderTargetViewFactory {
   virtual std::unique_ptr<IRenderTargetView> Get() const = 0;
 };
 
-class D3D11RenderTargetView final : public IRenderTargetView {
+class RenderTargetView final : public IRenderTargetView {
  public:
-  D3D11RenderTargetView() = delete;
-  D3D11RenderTargetView(const winrt::com_ptr<ID3D11RenderTargetView>&);
-  ~D3D11RenderTargetView();
+  RenderTargetView() = delete;
+  RenderTargetView(const winrt::com_ptr<ID3D11RenderTargetView>&);
+  ~RenderTargetView();
 
   virtual ID3D11RenderTargetView* Get() const override;
 
  private:
   winrt::com_ptr<ID3D11RenderTargetView> mImpl;
 };
 
-class D3D11RenderTargetViewFactory final : public IRenderTargetViewFactory {
+class RenderTargetViewFactory final : public IRenderTargetViewFactory {
  public:
-  D3D11RenderTargetViewFactory(ID3D11Device*, ID3D11Texture2D*);
-  virtual ~D3D11RenderTargetViewFactory();
+  RenderTargetViewFactory(ID3D11Device*, ID3D11Texture2D*);
+  virtual ~RenderTargetViewFactory();
 
   virtual std::unique_ptr<IRenderTargetView> Get() const override;