IObject: Add templated QueryInterface to avoid manual casts

Author: TheMostDiligent

Common/interface/BasicFileStream.hpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2024 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -51,7 +51,7 @@ class BasicFileStream : public ObjectBase<IFileStream>
                     const Char*         Path,
                     EFileAccessMode     Access = EFileAccessMode::Read);
 
-    virtual void DILIGENT_CALL_TYPE QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override;
+    IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_FileStream, TBase)
 
     /// Reads data from the stream
     virtual void DILIGENT_CALL_TYPE ReadBlob(IDataBlob* pData) override;

Common/interface/DataBlobImpl.hpp

@@ -55,7 +55,7 @@ class DataBlobImpl final : public ObjectBase<IDataBlob>
 
     ~DataBlobImpl() override;
 
-    virtual void DILIGENT_CALL_TYPE QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override;
+    IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_DataBlob, TBase);
 
     /// Sets the size of the internal data buffer
     virtual void DILIGENT_CALL_TYPE Resize(size_t NewSize) override;

Common/interface/MemoryFileStream.hpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2024 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -47,7 +47,7 @@ class MemoryFileStream final : public ObjectBase<IFileStream>
     MemoryFileStream(IReferenceCounters* pRefCounters,
                      IDataBlob*          pData);
 
-    virtual void DILIGENT_CALL_TYPE QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override final;
+    IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_FileStream, TBase)
 
     /// Reads data from the stream
     virtual void DILIGENT_CALL_TYPE ReadBlob(IDataBlob* pData) override final;

Common/interface/ObjectBase.hpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -56,10 +56,12 @@ namespace Diligent
     void ClassName::QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) \
         IMPLEMENT_QUERY_INTERFACE_BODY(InterfaceID, ParentClassName)
 
+// clang-format off
 #define IMPLEMENT_QUERY_INTERFACE_IN_PLACE(InterfaceID, ParentClassName)                                    \
     virtual void DILIGENT_CALL_TYPE QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override \
-        IMPLEMENT_QUERY_INTERFACE_BODY(InterfaceID, ParentClassName)
-
+        IMPLEMENT_QUERY_INTERFACE_BODY(InterfaceID, ParentClassName)                                        \
+        using IObject::QueryInterface;
+// clang-format on
 
 #define IMPLEMENT_QUERY_INTERFACE2_BODY(InterfaceID1, InterfaceID2, ParentClassName) \
     {                                                                                \
@@ -80,9 +82,12 @@ namespace Diligent
     void ClassName::QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface)         \
         IMPLEMENT_QUERY_INTERFACE2_BODY(InterfaceID1, InterfaceID2, ParentClassName)
 
+// clang-format off
 #define IMPLEMENT_QUERY_INTERFACE2_IN_PLACE(InterfaceID1, InterfaceID2, ParentClassName)                    \
     virtual void DILIGENT_CALL_TYPE QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override \
-        IMPLEMENT_QUERY_INTERFACE2_BODY(InterfaceID1, InterfaceID2, ParentClassName)
+        IMPLEMENT_QUERY_INTERFACE2_BODY(InterfaceID1, InterfaceID2, ParentClassName)                        \
+        using IObject::QueryInterface;
+// clang-format on
 
 /// Template class implementing base functionality for an object
 template <typename BaseInterface>

Common/src/BasicFileStream.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2024 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -50,8 +50,6 @@ BasicFileStream::BasicFileStream(IReferenceCounters* pRefCounters,
 {
 }
 
-IMPLEMENT_QUERY_INTERFACE(BasicFileStream, IID_FileStream, TBase)
-
 bool BasicFileStream::Read(void* Data, size_t Size)
 {
     return m_FileWrpr->Read(Data, Size);

Common/src/DataBlobImpl.cpp

@@ -106,9 +106,6 @@ const void* DataBlobImpl::GetConstDataPtr(size_t Offset) const
     return !m_DataBuff.empty() ? &m_DataBuff[Offset] : nullptr;
 }
 
-IMPLEMENT_QUERY_INTERFACE(DataBlobImpl, IID_DataBlob, TBase)
-
-
 void* DataBlobAllocatorAdapter::Allocate(size_t Size, const Char* dbgDescription, const char* dbgFileName, const Int32 dbgLineNumber)
 {
     VERIFY(!m_pDataBlob, "The data blob has already been created. The allocator does not support more than one blob.");

Common/src/GeometryPrimitives.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2024 Diligent Graphics LLC
+ *  Copyright 2024-2025 Diligent Graphics LLC
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -90,7 +90,7 @@ void CreateCubeGeometryInternal(Uint32                          NumSubdivisions,
     {
         pVertexData = DataBlobImpl::Create(VertexDataSize);
         DEV_CHECK_ERR(*ppVertices == nullptr, "*ppVertices is not null, which may cause memory leak");
-        pVertexData->QueryInterface(IID_DataBlob, reinterpret_cast<IObject**>(ppVertices));
+        pVertexData->QueryInterface(IID_DataBlob, ppVertices);
         pVert = pVertexData->GetDataPtr<Uint8>();
     }
 
@@ -100,7 +100,7 @@ void CreateCubeGeometryInternal(Uint32                          NumSubdivisions,
     {
         pIndexData = DataBlobImpl::Create(IndexDataSize);
         DEV_CHECK_ERR(*ppIndices == nullptr, "*ppIndices is not null, which may cause memory leak");
-        pIndexData->QueryInterface(IID_DataBlob, reinterpret_cast<IObject**>(ppIndices));
+        pIndexData->QueryInterface(IID_DataBlob, ppIndices);
         pIdx = pIndexData->GetDataPtr<Uint32>();
     }
 

Common/src/MemoryFileStream.cpp

@@ -45,8 +45,6 @@ MemoryFileStream::MemoryFileStream(IReferenceCounters* pRefCounters,
 {
 }
 
-IMPLEMENT_QUERY_INTERFACE(MemoryFileStream, IID_FileStream, TBase)
-
 bool MemoryFileStream::Read(void* Data, size_t Size)
 {
     if (Size == 0)

Graphics/GraphicsEngine/include/EngineFactoryBase.hpp

@@ -80,6 +80,8 @@ class EngineFactoryBase : public BaseInterface
         }
     }
 
+    using IObject::QueryInterface;
+
     virtual ReferenceCounterValueType DILIGENT_CALL_TYPE AddRef() override final
     {
         return m_RefCounters.AddStrongRef();
@@ -103,7 +105,7 @@ class EngineFactoryBase : public BaseInterface
     virtual void DILIGENT_CALL_TYPE CreateDataBlob(size_t InitialSize, const void* pData, IDataBlob** ppDataBlob) const override final
     {
         if (RefCntAutoPtr<DataBlobImpl> pDataBlob = DataBlobImpl::Create(InitialSize, pData))
-            pDataBlob->QueryInterface(IID_DataBlob, reinterpret_cast<IObject**>(ppDataBlob));
+            pDataBlob->QueryInterface(IID_DataBlob, ppDataBlob);
     }
 
     virtual void DILIGENT_CALL_TYPE CreateDefaultShaderSourceStreamFactory(const Char*                       SearchDirectories,

Graphics/GraphicsEngine/src/DearchiverBase.cpp

@@ -804,7 +804,7 @@ void DearchiverBase::UnpackShader(const ShaderUnpackInfo& UnpackInfo,
     if (!pShader)
         return;
 
-    pShader->QueryInterface(IID_Shader, reinterpret_cast<IObject**>(ppShader));
+    pShader->QueryInterface(IID_Shader, ppShader);
 }
 
 void DearchiverBase::UnpackResourceSignature(const ResourceSignatureUnpackInfo& DeArchiveInfo,