we keep trying, this should be it

Author: bob80905

include/dxc/Support/dxcapi.extval.h

@@ -26,26 +26,7 @@ class DxcDllExtValidationLoader : public DllLoader {
 
   HRESULT Initialize() { return InitializeInternal("DxcCreateInstance"); }
 
-  /* Note, OverrideDll takes this dll argument and ignores it
-  to satisfy the IDllLoader interface. The parameter is ignored
-  because the relevant dlls are specific and known: dxcompiler.dll
-  and dxil.dll. This class is not designed to handle any other dlls */
-  HRESULT OverrideDll(LPCSTR dll, LPCSTR entryPoint) {
-    return InitializeInternal(entryPoint);
-  }
-
-  bool HasCreateWithMalloc() const {
-    assert(DxCompilerSupport.HasCreateWithMalloc() &&
-           DxilExtValSupport.HasCreateWithMalloc());
-    return true;
-  }
-
+  
   bool IsEnabled() const override { return DxCompilerSupport.IsEnabled(); }
-
-  HMODULE Detach() {
-    // Can't Detach and return a handle for DxilSupport. Cleanup() instead.
-    DxilExtValSupport.Cleanup();
-    return DxCompilerSupport.Detach();
-  }
 };
-} // namespace dxc
+} // namespace dxc

include/dxc/Support/dxcapi.use.h

@@ -31,7 +31,7 @@ class DllLoader {
 
 public:
   DllLoader() = default;
-  DllLoader(const DllLoader &) = delete;
+  DllLoader(const DllLoader &) = default; // needed for HlslIntellisenseSupport
   DllLoader(DllLoader &&) = delete;
 
   template <typename TInterface>
@@ -115,15 +115,6 @@ class SpecificDllLoader : public DllLoader {
   SpecificDllLoader()
       : m_dll(nullptr), m_createFn(nullptr), m_createFn2(nullptr) {}
 
-  SpecificDllLoader(SpecificDllLoader &&other) {
-    m_dll = other.m_dll;
-    other.m_dll = nullptr;
-    m_createFn = other.m_createFn;
-    other.m_createFn = nullptr;
-    m_createFn2 = other.m_createFn2;
-    other.m_createFn2 = nullptr;
-  }
-
   ~SpecificDllLoader() override { Cleanup(); }
 
   HRESULT Initialize() {