rename to IDllLoader, rename to OverrideDll, remove defaulted functions, remove initialize

Author: bob80905

include/dxc/Support/dxcapi.extval.h

@@ -2,7 +2,7 @@
 #include <string>
 
 namespace dxc {
-class DxcDllExtValidationLoader : public DllLoader {
+class DxcDllExtValidationLoader : public IDllLoader {
   // DxCompilerSupport manages the
   // lifetime of dxcompiler.dll, while DxilExtValSupport
   // manages the lifetime of dxil.dll
@@ -26,7 +26,7 @@ class DxcDllExtValidationLoader : public DllLoader {
                           IUnknown **pResult);
 
   HRESULT Initialize() { return InitializeInternal("DxcCreateInstance"); }
-  HRESULT InitializeForDll(LPCSTR dll, LPCSTR entryPoint) {
+  HRESULT OverrideDll(LPCSTR dll, LPCSTR entryPoint) {
     return InitializeInternal(dll);
   }
 

include/dxc/Support/dxcapi.use.h

@@ -20,17 +20,9 @@ extern const char *kDxCompilerLib;
 extern const char *kDxilLib;
 
 // Interface for common dll operations
-class DllLoader {
+class IDllLoader {
 public:
-  DllLoader() = default;
-
-  DllLoader(DllLoader &&other) = default;
-
-  virtual ~DllLoader() = default;
-
-  virtual HRESULT Initialize() = 0;
-
-  virtual HRESULT InitializeForDll(LPCSTR dll, LPCSTR entryPoint) = 0;
+  virtual HRESULT OverrideDll(LPCSTR dll, LPCSTR entryPoint) = 0;
 
   template <typename TInterface>
   HRESULT CreateInstance(REFCLSID clsid, TInterface **pResult) {
@@ -63,7 +55,7 @@ class DllLoader {
 };
 
 // Helper class to dynamically load the dxcompiler or a compatible libraries.
-class SpecificDllLoader : public DllLoader {
+class SpecificDllLoader : public IDllLoader {
 
   HMODULE m_dll;
   DxcCreateInstanceProc m_createFn;
@@ -135,13 +127,13 @@ class SpecificDllLoader : public DllLoader {
     return InitializeInternal(kDxCompilerLib, "DxcCreateInstance");
   }
 
-  HRESULT InitializeForDll(LPCSTR dll, LPCSTR entryPoint) {
+  HRESULT OverrideDll(LPCSTR dll, LPCSTR entryPoint) {
     return InitializeInternal(dll, entryPoint);
   }
 
   // Also bring visibility into the interface definition of this function
   // which takes 2 args
-  using DllLoader::CreateInstance;
+  using IDllLoader::CreateInstance;
   HRESULT CreateInstance(REFCLSID clsid, REFIID riid, IUnknown **pResult) {
     if (pResult == nullptr)
       return E_POINTER;
@@ -153,7 +145,7 @@ class SpecificDllLoader : public DllLoader {
 
   // Also bring visibility into the interface definition of this function
   // which takes 3 args
-  using DllLoader::CreateInstance2;
+  using IDllLoader::CreateInstance2;
   HRESULT CreateInstance2(IMalloc *pMalloc, REFCLSID clsid, REFIID riid,
                           IUnknown **pResult) {
     if (pResult == nullptr)

lib/DxcSupport/HLSLOptions.cpp

@@ -1389,8 +1389,8 @@ int SetupSpecificDllLoader(const DxcOpts &opts,
                            llvm::raw_ostream &errors) {
   if (!opts.ExternalLib.empty()) {
     DXASSERT(!opts.ExternalFn.empty(), "else ReadDxcOpts should have failed");
-    HRESULT hrLoad = dxcSupport.InitializeForDll(opts.ExternalLib.data(),
-                                                 opts.ExternalFn.data());
+    HRESULT hrLoad =
+        dxcSupport.OverrideDll(opts.ExternalLib.data(), opts.ExternalFn.data());
     if (DXC_FAILED(hrLoad)) {
       errors << "Unable to load support for external DLL " << opts.ExternalLib
              << " with function " << opts.ExternalFn << " - error 0x";

lib/DxcSupport/dxcapi.extval.cpp

@@ -25,7 +25,7 @@ HRESULT DxcDllExtValidationLoader::CreateInstance2(IMalloc *pMalloc,
 
 HRESULT DxcDllExtValidationLoader::InitializeInternal(LPCSTR fnName) {
   // Load dxcompiler.dll
-  HRESULT Result = DxCompilerSupport.InitializeForDll(kDxCompilerLib, fnName);
+  HRESULT Result = DxCompilerSupport.OverrideDll(kDxCompilerLib, fnName);
   // if dxcompiler.dll fails to load, return the failed HRESULT
   if (DXC_FAILED(Result)) {
     return Result;
@@ -45,7 +45,7 @@ HRESULT DxcDllExtValidationLoader::InitializeInternal(LPCSTR fnName) {
     return E_INVALIDARG;
   }
 
-  return DxilExtValSupport.InitializeForDll(DxilDllPath.c_str(), fnName);
+  return DxilExtValSupport.OverrideDll(DxilDllPath.c_str(), fnName);
 }
 
 bool DxcDllExtValidationLoader::GetCreateInstanceProcs(

projects/dxilconv/unittests/DxilConvTests.cpp

@@ -170,7 +170,7 @@ class DxilConvTest {
 bool DxilConvTest::InitSupport() {
   if (!m_dllSupport.IsEnabled()) {
     VERIFY_SUCCEEDED(
-        m_dllSupport.InitializeForDll("dxilconv.dll", "DxcCreateInstance"));
+        m_dllSupport.OverrideDll("dxilconv.dll", "DxcCreateInstance"));
   }
 
   if (!FindToolInBinDir("%dxbc2dxil", "dxbc2dxil.exe")) {

tools/clang/tools/dxclib/dxc.cpp

@@ -1327,7 +1327,7 @@ void DxcContext::GetCompilerVersionInfo(llvm::raw_string_ostream &OS) {
 
   // Print validator if exists
   SpecificDllLoader DxilSupport;
-  DxilSupport.InitializeForDll(kDxilLib, "DxcCreateInstance");
+  DxilSupport.OverrideDll(kDxilLib, "DxcCreateInstance");
   WriteDXILVersionInfo(OS, DxilSupport);
 }
 

tools/clang/tools/dxopt/dxopt.cpp

@@ -317,7 +317,7 @@ int main(int argc, const char **argv) {
     if (externalLib) {
       CW2A externalFnA(externalFn);
       CW2A externalLibA(externalLib);
-      IFT(g_DxcSupport.InitializeForDll(externalLibA, externalFnA));
+      IFT(g_DxcSupport.OverrideDll(externalLibA, externalFnA));
     } else {
       IFT(g_DxcSupport.Initialize());
     }

tools/clang/tools/dxrfallbackcompiler/dxillib.cpp

@@ -46,8 +46,7 @@ bool DxilLibIsEnabled() {
   EnterCriticalSection(&cs);
   if (SUCCEEDED(g_DllLibResult)) {
     if (!g_DllSupport.IsEnabled()) {
-      g_DllLibResult =
-          g_DllSupport.InitializeForDll(kDxilLib, "DxcCreateInstance");
+      g_DllLibResult = g_DllSupport.OverrideDll(kDxilLib, "DxcCreateInstance");
     }
   }
   LeaveCriticalSection(&cs);

tools/clang/unittests/DxrFallback/test_DxrFallback.cpp

@@ -140,8 +140,8 @@ class Tester {
   Tester(const std::string &deviceName, const std::string &path)
       : m_deviceName(s2ws(deviceName)), m_path(path) {
     dxc::EnsureEnabled(m_dxcSupport);
-    m_dxrFallbackSupport.InitializeForDll("DxrFallbackCompiler.dll",
-                                          "DxcCreateDxrFallbackCompiler");
+    m_dxrFallbackSupport.OverrideDll("DxrFallbackCompiler.dll",
+                                     "DxcCreateDxrFallbackCompiler");
   }
 
   void setFiles(const std::vector<std::string> &files) {