From 932de1b00159210b30029ea06fbe92d7e5c8914e Mon Sep 17 00:00:00 2001 From: "Bernhart, Bryan" Date: Wed, 18 Jan 2023 10:39:09 -0800 Subject: [PATCH] Rename IUnknownImpl to Unknown. --- src/gpgmm/BUILD.gn | 4 +- src/gpgmm/CMakeLists.txt | 4 +- src/gpgmm/d3d12/DebugObjectD3D12.h | 4 +- src/gpgmm/d3d12/HeapD3D12.cpp | 4 +- src/gpgmm/d3d12/HeapD3D12.h | 2 +- src/gpgmm/d3d12/ResidencyListD3D12.h | 9 ++-- src/gpgmm/d3d12/ResidencyManagerD3D12.h | 9 ++-- src/gpgmm/d3d12/ResourceAllocationD3D12.h | 8 ++-- src/gpgmm/d3d12/ResourceAllocatorD3D12.h | 9 ++-- ...IUnknownImplD3D12.cpp => UnknownD3D12.cpp} | 12 +++--- .../{IUnknownImplD3D12.h => UnknownD3D12.h} | 26 ++++++------ src/mvi/gpgmm_d3d12.cpp | 42 +++++++++---------- src/mvi/gpgmm_d3d12.h | 16 +++---- src/tests/BUILD.gn | 2 +- src/tests/CMakeLists.txt | 2 +- ...ownImplTests.cpp => D3D12UnknownTests.cpp} | 24 +++++------ 16 files changed, 87 insertions(+), 90 deletions(-) rename src/gpgmm/d3d12/{IUnknownImplD3D12.cpp => UnknownD3D12.cpp} (82%) rename src/gpgmm/d3d12/{IUnknownImplD3D12.h => UnknownD3D12.h} (72%) rename src/tests/end2end/{D3D12IUnknownImplTests.cpp => D3D12UnknownTests.cpp} (68%) diff --git a/src/gpgmm/BUILD.gn b/src/gpgmm/BUILD.gn index afd11fd1c..c13d7fee2 100644 --- a/src/gpgmm/BUILD.gn +++ b/src/gpgmm/BUILD.gn @@ -127,8 +127,6 @@ source_set("gpgmm_sources") { "d3d12/FenceD3D12.h", "d3d12/HeapD3D12.cpp", "d3d12/HeapD3D12.h", - "d3d12/IUnknownImplD3D12.cpp", - "d3d12/IUnknownImplD3D12.h", "d3d12/JSONSerializerD3D12.cpp", "d3d12/JSONSerializerD3D12.h", "d3d12/ResidencyListD3D12.cpp", @@ -142,6 +140,8 @@ source_set("gpgmm_sources") { "d3d12/ResourceHeapAllocatorD3D12.cpp", "d3d12/ResourceHeapAllocatorD3D12.h", "d3d12/ResourceSizeD3D12.h", + "d3d12/UnknownD3D12.cpp", + "d3d12/UnknownD3D12.h", "d3d12/UtilsD3D12.cpp", "d3d12/UtilsD3D12.h", "d3d12/d3d12_platform.h", diff --git a/src/gpgmm/CMakeLists.txt b/src/gpgmm/CMakeLists.txt index f0ed38e8b..72e8ebddd 100644 --- a/src/gpgmm/CMakeLists.txt +++ b/src/gpgmm/CMakeLists.txt @@ -69,8 +69,6 @@ if (GPGMM_ENABLE_D3D12) "d3d12/FenceD3D12.h" "d3d12/HeapD3D12.cpp" "d3d12/HeapD3D12.h" - "d3d12/IUnknownImplD3D12.cpp" - "d3d12/IUnknownImplD3D12.h" "d3d12/JSONSerializerD3D12.cpp" "d3d12/JSONSerializerD3D12.h" "d3d12/ResidencyListD3D12.cpp" @@ -83,6 +81,8 @@ if (GPGMM_ENABLE_D3D12) "d3d12/ResourceAllocatorD3D12.h" "d3d12/ResourceHeapAllocatorD3D12.cpp" "d3d12/ResourceHeapAllocatorD3D12.h" + "d3d12/UnknownD3D12.cpp" + "d3d12/UnknownD3D12.h" "d3d12/UtilsD3D12.cpp" "d3d12/UtilsD3D12.h" "d3d12/d3d12_platform.h" diff --git a/src/gpgmm/d3d12/DebugObjectD3D12.h b/src/gpgmm/d3d12/DebugObjectD3D12.h index 95d2e1927..51f19cad1 100644 --- a/src/gpgmm/d3d12/DebugObjectD3D12.h +++ b/src/gpgmm/d3d12/DebugObjectD3D12.h @@ -15,14 +15,14 @@ #ifndef GPGMM_D3D12_DEBUGOBJECTD3D12_H_ #define GPGMM_D3D12_DEBUGOBJECTD3D12_H_ -#include "gpgmm/d3d12/IUnknownImplD3D12.h" +#include "gpgmm/d3d12/UnknownD3D12.h" #include "gpgmm/d3d12/d3d12_platform.h" #include namespace gpgmm::d3d12 { - class DebugObject : public IUnknownImpl { + class DebugObject : public Unknown { public: virtual ~DebugObject() override = default; diff --git a/src/gpgmm/d3d12/HeapD3D12.cpp b/src/gpgmm/d3d12/HeapD3D12.cpp index 9502a978c..b3698a725 100644 --- a/src/gpgmm/d3d12/HeapD3D12.cpp +++ b/src/gpgmm/d3d12/HeapD3D12.cpp @@ -206,11 +206,11 @@ namespace gpgmm::d3d12 { } ULONG STDMETHODCALLTYPE Heap::AddRef() { - return IUnknownImpl::AddRef(); + return Unknown::AddRef(); } ULONG STDMETHODCALLTYPE Heap::Release() { - return IUnknownImpl::Release(); + return Unknown::Release(); } void Heap::SetResidencyState(RESIDENCY_STATUS newStatus) { diff --git a/src/gpgmm/d3d12/HeapD3D12.h b/src/gpgmm/d3d12/HeapD3D12.h index 59fb2a339..ddf2917bc 100644 --- a/src/gpgmm/d3d12/HeapD3D12.h +++ b/src/gpgmm/d3d12/HeapD3D12.h @@ -18,7 +18,7 @@ #include "gpgmm/common/Memory.h" #include "gpgmm/d3d12/DebugObjectD3D12.h" -#include "gpgmm/d3d12/IUnknownImplD3D12.h" +#include "gpgmm/d3d12/UnknownD3D12.h" #include "gpgmm/utils/Limits.h" #include "gpgmm/utils/LinkedList.h" diff --git a/src/gpgmm/d3d12/ResidencyListD3D12.h b/src/gpgmm/d3d12/ResidencyListD3D12.h index faa152fd6..1ca078047 100644 --- a/src/gpgmm/d3d12/ResidencyListD3D12.h +++ b/src/gpgmm/d3d12/ResidencyListD3D12.h @@ -15,7 +15,7 @@ #ifndef GPGMM_D3D12_RESIDENCYLISTD3D12_H_ #define GPGMM_D3D12_RESIDENCYLISTD3D12_H_ -#include "gpgmm/d3d12/IUnknownImplD3D12.h" +#include "gpgmm/d3d12/UnknownD3D12.h" #include "gpgmm/d3d12/d3d12_platform.h" #include @@ -28,7 +28,7 @@ namespace gpgmm::d3d12 { class JSONSerializer; class ResidencyManager; - class ResidencyList final : public IResidencyList, public IUnknownImpl { + class ResidencyList final : public IResidencyList, public Unknown { public: ResidencyList(); ~ResidencyList() override; @@ -36,10 +36,9 @@ namespace gpgmm::d3d12 { HRESULT Add(IHeap* pHeap) override; HRESULT Reset() override; - DEFINE_IUNKNOWNIMPL_OVERRIDES() + DEFINE_Unknown_OVERRIDES() - private: - friend JSONSerializer; + private : friend JSONSerializer; friend ResidencyManager; using UnderlyingType = std::vector; diff --git a/src/gpgmm/d3d12/ResidencyManagerD3D12.h b/src/gpgmm/d3d12/ResidencyManagerD3D12.h index 8969f6b84..e0a30616d 100644 --- a/src/gpgmm/d3d12/ResidencyManagerD3D12.h +++ b/src/gpgmm/d3d12/ResidencyManagerD3D12.h @@ -17,7 +17,7 @@ #define GPGMM_D3D12_RESIDENCYMANAGERD3D12_H_ #include "gpgmm/common/Object.h" -#include "gpgmm/d3d12/IUnknownImplD3D12.h" +#include "gpgmm/d3d12/UnknownD3D12.h" #include "gpgmm/utils/EnumFlags.h" #include "gpgmm/utils/LinkedList.h" @@ -39,7 +39,7 @@ namespace gpgmm::d3d12 { class ResourceAllocator; class ResourceHeapAllocator; - class ResidencyManager final : public IUnknownImpl, public IResidencyManager, ObjectBase { + class ResidencyManager final : public Unknown, public IResidencyManager, ObjectBase { public: static HRESULT CreateResidencyManager(const RESIDENCY_DESC& descriptor, IResidencyManager** ppResidencyManagerOut); @@ -63,10 +63,9 @@ namespace gpgmm::d3d12 { RESIDENCY_STATS GetStats() const override; - DEFINE_IUNKNOWNIMPL_OVERRIDES() + DEFINE_Unknown_OVERRIDES() - private: - friend Heap; + private : friend Heap; friend ResourceAllocator; friend ResourceHeapAllocator; diff --git a/src/gpgmm/d3d12/ResourceAllocationD3D12.h b/src/gpgmm/d3d12/ResourceAllocationD3D12.h index 0595c7bb4..dda02911e 100644 --- a/src/gpgmm/d3d12/ResourceAllocationD3D12.h +++ b/src/gpgmm/d3d12/ResourceAllocationD3D12.h @@ -18,7 +18,7 @@ #include "gpgmm/common/MemoryAllocation.h" #include "gpgmm/d3d12/DebugObjectD3D12.h" -#include "gpgmm/d3d12/IUnknownImplD3D12.h" +#include "gpgmm/d3d12/UnknownD3D12.h" #include "gpgmm/d3d12/d3d12_platform.h" #include @@ -45,10 +45,10 @@ namespace gpgmm::d3d12 { RESOURCE_ALLOCATION_INFO GetInfo() const override; IHeap* GetMemory() const override; - DEFINE_IUNKNOWNIMPL_OVERRIDES() + DEFINE_Unknown_OVERRIDES() - // IDebugObject interface - LPCWSTR GetDebugName() const override; + // IDebugObject interface + LPCWSTR GetDebugName() const override; HRESULT SetDebugName(LPCWSTR Name) override; private: diff --git a/src/gpgmm/d3d12/ResourceAllocatorD3D12.h b/src/gpgmm/d3d12/ResourceAllocatorD3D12.h index b7b939628..259e45914 100644 --- a/src/gpgmm/d3d12/ResourceAllocatorD3D12.h +++ b/src/gpgmm/d3d12/ResourceAllocatorD3D12.h @@ -17,7 +17,7 @@ #define GPGMM_D3D12_RESOURCEALLOCATORD3D12_H_ #include "gpgmm/common/MemoryAllocator.h" -#include "gpgmm/d3d12/IUnknownImplD3D12.h" +#include "gpgmm/d3d12/UnknownD3D12.h" #include "gpgmm/utils/EnumFlags.h" #include @@ -70,7 +70,7 @@ namespace gpgmm::d3d12 { const D3D12_RESOURCE_DESC* mResourceDescriptor; }; - class ResourceAllocator final : public IUnknownImpl, + class ResourceAllocator final : public Unknown, public IResourceAllocator, public MemoryAllocator { public: @@ -99,10 +99,9 @@ namespace gpgmm::d3d12 { void* pFeatureSupportData, uint32_t featureSupportDataSize) const override; - DEFINE_IUNKNOWNIMPL_OVERRIDES() + DEFINE_Unknown_OVERRIDES() - private: - friend BufferAllocator; + private : friend BufferAllocator; friend ResourceAllocation; // ObjectBase interface diff --git a/src/gpgmm/d3d12/IUnknownImplD3D12.cpp b/src/gpgmm/d3d12/UnknownD3D12.cpp similarity index 82% rename from src/gpgmm/d3d12/IUnknownImplD3D12.cpp rename to src/gpgmm/d3d12/UnknownD3D12.cpp index d9fd84fee..31d8a9f2d 100644 --- a/src/gpgmm/d3d12/IUnknownImplD3D12.cpp +++ b/src/gpgmm/d3d12/UnknownD3D12.cpp @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gpgmm/d3d12/IUnknownImplD3D12.h" +#include "gpgmm/d3d12/UnknownD3D12.h" namespace gpgmm::d3d12 { - IUnknownImpl::IUnknownImpl() : mRefCount(1) { + Unknown::Unknown() : mRefCount(1) { } - HRESULT IUnknownImpl::QueryInterface(REFIID riid, void** ppvObject) { + HRESULT Unknown::QueryInterface(REFIID riid, void** ppvObject) { // Always set out parameter to nullptr, validating it first. if (ppvObject == nullptr) { return E_INVALIDARG; @@ -36,12 +36,12 @@ namespace gpgmm::d3d12 { return E_NOINTERFACE; } - ULONG IUnknownImpl::AddRef() { + ULONG Unknown::AddRef() { mRefCount.Ref(); return mRefCount.GetRefCount(); } - ULONG IUnknownImpl::Release() { + ULONG Unknown::Release() { const ULONG refCount = mRefCount.Unref() ? 0 : mRefCount.GetRefCount(); if (refCount == 0) { DeleteThis(); @@ -49,7 +49,7 @@ namespace gpgmm::d3d12 { return refCount; } - void IUnknownImpl::DeleteThis() { + void Unknown::DeleteThis() { delete this; } } // namespace gpgmm::d3d12 diff --git a/src/gpgmm/d3d12/IUnknownImplD3D12.h b/src/gpgmm/d3d12/UnknownD3D12.h similarity index 72% rename from src/gpgmm/d3d12/IUnknownImplD3D12.h rename to src/gpgmm/d3d12/UnknownD3D12.h index 2bc96992c..01253598e 100644 --- a/src/gpgmm/d3d12/IUnknownImplD3D12.h +++ b/src/gpgmm/d3d12/UnknownD3D12.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GPGMM_D3D12_IUNKNOWNIMPLD3D12_H_ -#define GPGMM_D3D12_IUNKNOWNIMPLD3D12_H_ +#ifndef GPGMM_D3D12_UnknownD3D12_H_ +#define GPGMM_D3D12_UnknownD3D12_H_ #include "gpgmm/d3d12/d3d12_platform.h" #include "gpgmm/utils/NonCopyable.h" @@ -21,20 +21,20 @@ #ifndef GPGMM_REFCOUNT_TYPE # include "gpgmm/utils/RefCount.h" /** \brief Defines the atomic-type to use for ref-counting the COM object. -*/ + */ # define GPGMM_REFCOUNT_TYPE RefCounted #endif namespace gpgmm::d3d12 { - /** \brief IUnknownImpl is a thread-safe ref-count implementation for custom COM based objects. + /** \brief Unknown is a thread-safe ref-count implementation for custom COM based objects. The custom COM based object must override DeleteThis() if they require a custom-deleter. */ - class IUnknownImpl : public IUnknown, public NonCopyable { + class Unknown : public IUnknown, public NonCopyable { public: - IUnknownImpl(); - virtual ~IUnknownImpl() = default; + Unknown(); + virtual ~Unknown() = default; // IUnknown interface HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) override; @@ -49,14 +49,14 @@ namespace gpgmm::d3d12 { GPGMM_REFCOUNT_TYPE mRefCount; // Maintains the COM ref-count of this object. }; -// Helper to provide IUnknown-based object types the required overrides to use IUnknownImpl. -#define DEFINE_IUNKNOWNIMPL_OVERRIDES() \ +// Helper to provide IUnknown-based object types the required overrides to use Unknown. +#define DEFINE_Unknown_OVERRIDES() \ inline HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) override { \ - return IUnknownImpl::QueryInterface(riid, ppvObject); \ + return Unknown::QueryInterface(riid, ppvObject); \ } \ - inline ULONG STDMETHODCALLTYPE AddRef() override { return IUnknownImpl::AddRef(); } \ - inline ULONG STDMETHODCALLTYPE Release() override { return IUnknownImpl::Release(); } + inline ULONG STDMETHODCALLTYPE AddRef() override { return Unknown::AddRef(); } \ + inline ULONG STDMETHODCALLTYPE Release() override { return Unknown::Release(); } } // namespace gpgmm::d3d12 -#endif // GPGMM_D3D12_IUNKNOWNIMPLD3D12_H_ +#endif // GPGMM_D3D12_UnknownD3D12_H_ diff --git a/src/mvi/gpgmm_d3d12.cpp b/src/mvi/gpgmm_d3d12.cpp index e7f0852b2..8091ad2a5 100644 --- a/src/mvi/gpgmm_d3d12.cpp +++ b/src/mvi/gpgmm_d3d12.cpp @@ -30,14 +30,14 @@ namespace gpgmm::d3d12 { static constexpr uint64_t kInvalidOffset = std::numeric_limits::max(); - // IUnknownImpl + // Unknown - IUnknownImpl::IUnknownImpl() : mRefCount(1) { + Unknown::Unknown() : mRefCount(1) { } - IUnknownImpl::~IUnknownImpl() = default; + Unknown::~Unknown() = default; - HRESULT STDMETHODCALLTYPE IUnknownImpl::QueryInterface(REFIID riid, void** ppvObject) { + HRESULT STDMETHODCALLTYPE Unknown::QueryInterface(REFIID riid, void** ppvObject) { // Always set out parameter to nullptr, validating it first. if (ppvObject == nullptr) { return E_INVALIDARG; @@ -54,11 +54,11 @@ namespace gpgmm::d3d12 { return E_NOINTERFACE; } - ULONG STDMETHODCALLTYPE IUnknownImpl::AddRef() { + ULONG STDMETHODCALLTYPE Unknown::AddRef() { return ++mRefCount; } - ULONG STDMETHODCALLTYPE IUnknownImpl::Release() { + ULONG STDMETHODCALLTYPE Unknown::Release() { const ULONG refCount = --mRefCount; if (refCount == 0) { DeleteThis(); @@ -66,7 +66,7 @@ namespace gpgmm::d3d12 { return refCount; } - void IUnknownImpl::DeleteThis() { + void Unknown::DeleteThis() { delete this; } @@ -103,11 +103,11 @@ namespace gpgmm::d3d12 { } ULONG STDMETHODCALLTYPE Heap::AddRef() { - return IUnknownImpl::AddRef(); + return Unknown::AddRef(); } ULONG STDMETHODCALLTYPE Heap::Release() { - return IUnknownImpl::Release(); + return Unknown::Release(); } LPCWSTR Heap::GetDebugName() const { @@ -138,15 +138,15 @@ namespace gpgmm::d3d12 { } HRESULT STDMETHODCALLTYPE ResidencyList::QueryInterface(REFIID riid, void** ppvObject) { - return IUnknownImpl::QueryInterface(riid, ppvObject); + return Unknown::QueryInterface(riid, ppvObject); } ULONG STDMETHODCALLTYPE ResidencyList::AddRef() { - return IUnknownImpl::AddRef(); + return Unknown::AddRef(); } ULONG STDMETHODCALLTYPE ResidencyList::Release() { - return IUnknownImpl::Release(); + return Unknown::Release(); } // ResidencyManager @@ -206,15 +206,15 @@ namespace gpgmm::d3d12 { } HRESULT STDMETHODCALLTYPE ResidencyManager::QueryInterface(REFIID riid, void** ppvObject) { - return IUnknownImpl::QueryInterface(riid, ppvObject); + return Unknown::QueryInterface(riid, ppvObject); } ULONG STDMETHODCALLTYPE ResidencyManager::AddRef() { - return IUnknownImpl::AddRef(); + return Unknown::AddRef(); } ULONG STDMETHODCALLTYPE ResidencyManager::Release() { - return IUnknownImpl::Release(); + return Unknown::Release(); } // ResourceAllocation @@ -261,15 +261,15 @@ namespace gpgmm::d3d12 { } HRESULT STDMETHODCALLTYPE ResourceAllocation::QueryInterface(REFIID riid, void** ppvObject) { - return IUnknownImpl::QueryInterface(riid, ppvObject); + return Unknown::QueryInterface(riid, ppvObject); } ULONG STDMETHODCALLTYPE ResourceAllocation::AddRef() { - return IUnknownImpl::AddRef(); + return Unknown::AddRef(); } ULONG STDMETHODCALLTYPE ResourceAllocation::Release() { - return IUnknownImpl::Release(); + return Unknown::Release(); } LPCWSTR ResourceAllocation::GetDebugName() const { @@ -416,15 +416,15 @@ namespace gpgmm::d3d12 { } HRESULT STDMETHODCALLTYPE ResourceAllocator::QueryInterface(REFIID riid, void** ppvObject) { - return IUnknownImpl::QueryInterface(riid, ppvObject); + return Unknown::QueryInterface(riid, ppvObject); } ULONG STDMETHODCALLTYPE ResourceAllocator::AddRef() { - return IUnknownImpl::AddRef(); + return Unknown::AddRef(); } ULONG STDMETHODCALLTYPE ResourceAllocator::Release() { - return IUnknownImpl::Release(); + return Unknown::Release(); } CreateCommittedResourceCallbackContext::CreateCommittedResourceCallbackContext( diff --git a/src/mvi/gpgmm_d3d12.h b/src/mvi/gpgmm_d3d12.h index fee048cea..fce4ae1bf 100644 --- a/src/mvi/gpgmm_d3d12.h +++ b/src/mvi/gpgmm_d3d12.h @@ -44,10 +44,10 @@ namespace gpgmm::d3d12 { - class IUnknownImpl : public IUnknown { + class Unknown : public IUnknown { public: - IUnknownImpl(); - virtual ~IUnknownImpl(); + Unknown(); + virtual ~Unknown(); HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) override; ULONG STDMETHODCALLTYPE AddRef() override; @@ -60,7 +60,7 @@ namespace gpgmm::d3d12 { GPGMM_REFCOUNT_TYPE mRefCount; }; - class Heap final : public MemoryBase, public IUnknownImpl, public IHeap { + class Heap final : public MemoryBase, public Unknown, public IHeap { public: static HRESULT CreateHeap(const HEAP_DESC& descriptor, IResidencyManager* const pResidencyManager, @@ -88,7 +88,7 @@ namespace gpgmm::d3d12 { Microsoft::WRL::ComPtr mPageable; }; - class ResidencyList final : public IResidencyList, public IUnknownImpl { + class ResidencyList final : public IResidencyList, public Unknown { public: ResidencyList(); @@ -101,7 +101,7 @@ namespace gpgmm::d3d12 { ULONG STDMETHODCALLTYPE Release() override; }; - class ResidencyManager final : public IUnknownImpl, public IResidencyManager { + class ResidencyManager final : public Unknown, public IResidencyManager { public: static HRESULT CreateResidencyManager(const RESIDENCY_DESC& descriptor, IResidencyManager** ppResidencyManagerOut); @@ -137,7 +137,7 @@ namespace gpgmm::d3d12 { class ResourceAllocator; class ResourceAllocation final : public MemoryAllocation, - public IUnknownImpl, + public Unknown, public IResourceAllocation { public: // IResourceAllocation interface @@ -195,7 +195,7 @@ namespace gpgmm::d3d12 { }; class ResourceAllocator final : public MemoryAllocator, - public IUnknownImpl, + public Unknown, public IResourceAllocator { public: static HRESULT CreateResourceAllocator(const ALLOCATOR_DESC& allocatorDescriptor, diff --git a/src/tests/BUILD.gn b/src/tests/BUILD.gn index c38203a29..0005f4a76 100644 --- a/src/tests/BUILD.gn +++ b/src/tests/BUILD.gn @@ -153,9 +153,9 @@ source_set("gpgmm_end2end_tests_sources") { sources += [ "D3D12Test.cpp", "D3D12Test.h", - "end2end/D3D12IUnknownImplTests.cpp", "end2end/D3D12ResidencyManagerTests.cpp", "end2end/D3D12ResourceAllocatorTests.cpp", + "end2end/D3D12UnknownTests.cpp", ] libs += [ diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 4fb3a198a..da66a3142 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -68,7 +68,7 @@ if (GPGMM_ENABLE_D3D12) target_sources(gpgmm_end2end_tests PRIVATE "D3D12Test.cpp" "D3D12Test.h" - "end2end/D3D12IUnknownImplTests.cpp" + "end2end/D3D12UnknownTests.cpp" "end2end/D3D12ResidencyManagerTests.cpp" "end2end/D3D12ResourceAllocatorTests.cpp" ) diff --git a/src/tests/end2end/D3D12IUnknownImplTests.cpp b/src/tests/end2end/D3D12UnknownTests.cpp similarity index 68% rename from src/tests/end2end/D3D12IUnknownImplTests.cpp rename to src/tests/end2end/D3D12UnknownTests.cpp index 3b102f3f3..66e4585a6 100644 --- a/src/tests/end2end/D3D12IUnknownImplTests.cpp +++ b/src/tests/end2end/D3D12UnknownTests.cpp @@ -14,33 +14,33 @@ #include -#include "gpgmm/d3d12/IUnknownImplD3D12.h" +#include "gpgmm/d3d12/UnknownD3D12.h" using namespace gpgmm::d3d12; -class TestIUnknownImplSubClass final : public IUnknownImpl { +class TestUnknownSubClass final : public Unknown { public: - TestIUnknownImplSubClass() { + TestUnknownSubClass() { mInstanceCount++; } - ~TestIUnknownImplSubClass() override { + ~TestUnknownSubClass() override { mInstanceCount--; } static uint32_t mInstanceCount; }; -uint32_t TestIUnknownImplSubClass::mInstanceCount = 0u; +uint32_t TestUnknownSubClass::mInstanceCount = 0u; -TEST(D3D12IUnknownImplTests, IUnknownImpl) { - EXPECT_EQ(TestIUnknownImplSubClass::mInstanceCount, 0u); +TEST(D3D12UnknownTests, Unknown) { + EXPECT_EQ(TestUnknownSubClass::mInstanceCount, 0u); - // IUnknownImpl must be acquired/associated since it already + // Unknown must be acquired/associated since it already // refs itself upon creation. uint32_t refCount = 0; - ComPtr unknownObj; - unknownObj.Attach(new TestIUnknownImplSubClass()); + ComPtr unknownObj; + unknownObj.Attach(new TestUnknownSubClass()); - EXPECT_EQ(TestIUnknownImplSubClass::mInstanceCount, 1u); + EXPECT_EQ(TestUnknownSubClass::mInstanceCount, 1u); refCount++; @@ -61,5 +61,5 @@ TEST(D3D12IUnknownImplTests, IUnknownImpl) { otherUnknownObj = nullptr; unknownObj = nullptr; - EXPECT_EQ(TestIUnknownImplSubClass::mInstanceCount, 0u); + EXPECT_EQ(TestUnknownSubClass::mInstanceCount, 0u); }