From f6539414d458bbf0ff7bba0764b5dccf21353627 Mon Sep 17 00:00:00 2001
From: Fred Emmott <git@fredemmott.com>
Date: Sun, 28 Aug 2022 12:53:29 -0500
Subject: [PATCH] Rename D3D11On12::D3D11On12RenderTargetView to
 D3D11On12::RenderTargetView

---
 src/injectables/OculusD3D12Kneeboard.cpp  |  2 +-
 src/injectables/OpenXRD3D12Kneeboard.cpp  |  2 +-
 src/lib/D3D11On12.cpp                     | 15 +++++++--------
 src/lib/include/OpenKneeboard/D3D11On12.h | 15 +++++++--------
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/injectables/OculusD3D12Kneeboard.cpp b/src/injectables/OculusD3D12Kneeboard.cpp
index 50a8ca2a2..7a4817838 100644
--- a/src/injectables/OculusD3D12Kneeboard.cpp
+++ b/src/injectables/OculusD3D12Kneeboard.cpp
@@ -97,7 +97,7 @@ ovrTextureSwapChain OculusD3D12Kneeboard::CreateSwapChain(
 
     layerRenderTargets.at(i)
       = std::static_pointer_cast<D3D11::IRenderTargetViewFactory>(
-        std::make_shared<D3D11On12::D3D11On12RenderTargetViewFactory>(
+        std::make_shared<D3D11On12::RenderTargetViewFactory>(
           mDeviceResources, texture12));
   }
 
diff --git a/src/injectables/OpenXRD3D12Kneeboard.cpp b/src/injectables/OpenXRD3D12Kneeboard.cpp
index 70ea1c7ca..9145286a8 100644
--- a/src/injectables/OpenXRD3D12Kneeboard.cpp
+++ b/src/injectables/OpenXRD3D12Kneeboard.cpp
@@ -148,7 +148,7 @@ XrSwapchain OpenXRD3D12Kneeboard::CreateSwapChain(
     texture12.copy_from(images.at(i).texture);
     mRenderTargetViews.at(layerIndex).at(i)
       = std::static_pointer_cast<D3D11::IRenderTargetViewFactory>(
-        std::make_shared<D3D11On12::D3D11On12RenderTargetViewFactory>(
+        std::make_shared<D3D11On12::RenderTargetViewFactory>(
           mDeviceResources,
           texture12,
           mDoubleBufferForVarjoQuirk ? D3D11On12::Flags::DoubleBuffer
diff --git a/src/lib/D3D11On12.cpp b/src/lib/D3D11On12.cpp
index 6c234cc32..d20f251f0 100644
--- a/src/lib/D3D11On12.cpp
+++ b/src/lib/D3D11On12.cpp
@@ -25,7 +25,7 @@
 
 namespace OpenKneeboard::D3D11On12 {
 
-D3D11On12RenderTargetView::D3D11On12RenderTargetView(
+RenderTargetView::RenderTargetView(
   const DeviceResources& deviceResources,
   const winrt::com_ptr<ID3D12Resource>& texture12,
   const winrt::com_ptr<ID3D11Texture2D>& texture11,
@@ -42,7 +42,7 @@ D3D11On12RenderTargetView::D3D11On12RenderTargetView(
   }
 }
 
-D3D11On12RenderTargetView::~D3D11On12RenderTargetView() {
+RenderTargetView::~RenderTargetView() {
   if (!mBufferTexture11) {
     auto resources = static_cast<ID3D11Resource*>(mTexture11.get());
     mDeviceResources.m11on12->ReleaseWrappedResources(&resources, 1);
@@ -98,11 +98,11 @@ D3D11On12RenderTargetView::~D3D11On12RenderTargetView() {
   mDeviceResources.mCommandQueue12->ExecuteCommandLists(1, &commandLists);
 }
 
-ID3D11RenderTargetView* D3D11On12RenderTargetView::Get() const {
+ID3D11RenderTargetView* RenderTargetView::Get() const {
   return mRenderTargetView.get();
 }
 
-D3D11On12RenderTargetViewFactory::D3D11On12RenderTargetViewFactory(
+RenderTargetViewFactory::RenderTargetViewFactory(
   const DeviceResources& deviceResources,
   const winrt::com_ptr<ID3D12Resource>& texture12,
   Flags flags)
@@ -144,11 +144,10 @@ D3D11On12RenderTargetViewFactory::D3D11On12RenderTargetViewFactory(
     mRenderTargetView.put()));
 }
 
-D3D11On12RenderTargetViewFactory::~D3D11On12RenderTargetViewFactory() = default;
+RenderTargetViewFactory::~RenderTargetViewFactory() = default;
 
-std::unique_ptr<D3D11::IRenderTargetView>
-D3D11On12RenderTargetViewFactory::Get() const {
-  return std::make_unique<D3D11On12RenderTargetView>(
+std::unique_ptr<D3D11::IRenderTargetView> RenderTargetViewFactory::Get() const {
+  return std::make_unique<RenderTargetView>(
     mDeviceResources,
     mTexture12,
     mTexture11,
diff --git a/src/lib/include/OpenKneeboard/D3D11On12.h b/src/lib/include/OpenKneeboard/D3D11On12.h
index 5975add74..14807ecae 100644
--- a/src/lib/include/OpenKneeboard/D3D11On12.h
+++ b/src/lib/include/OpenKneeboard/D3D11On12.h
@@ -39,16 +39,16 @@ enum class Flags : uint16_t {
   DoubleBuffer = 1,// For Varjo
 };
 
-class D3D11On12RenderTargetView final : public D3D11::IRenderTargetView {
+class RenderTargetView final : public D3D11::IRenderTargetView {
  public:
-  D3D11On12RenderTargetView() = delete;
-  D3D11On12RenderTargetView(
+  RenderTargetView() = delete;
+  RenderTargetView(
     const DeviceResources&,
     const winrt::com_ptr<ID3D12Resource>& texture12,
     const winrt::com_ptr<ID3D11Texture2D>& texture11,
     const winrt::com_ptr<ID3D11Texture2D>& bufferTexture11,
     const winrt::com_ptr<ID3D11RenderTargetView>&);
-  ~D3D11On12RenderTargetView();
+  ~RenderTargetView();
 
   virtual ID3D11RenderTargetView* Get() const override;
 
@@ -60,14 +60,13 @@ class D3D11On12RenderTargetView final : public D3D11::IRenderTargetView {
   winrt::com_ptr<ID3D11RenderTargetView> mRenderTargetView;
 };
 
-class D3D11On12RenderTargetViewFactory final
-  : public D3D11::IRenderTargetViewFactory {
+class RenderTargetViewFactory final : public D3D11::IRenderTargetViewFactory {
  public:
-  D3D11On12RenderTargetViewFactory(
+  RenderTargetViewFactory(
     const DeviceResources&,
     const winrt::com_ptr<ID3D12Resource>& texture12,
     Flags flags = Flags::None);
-  virtual ~D3D11On12RenderTargetViewFactory();
+  virtual ~RenderTargetViewFactory();
 
   virtual std::unique_ptr<D3D11::IRenderTargetView> Get() const override;