revert to stage 1

Author: bob80905

include/dxc/Support/dxcapi.extval.h

@@ -89,13 +89,13 @@ class DxcDllSupport {
     other.m_createFn2 = nullptr;
   }
 
-  virtual ~DxcDllSupport() { Cleanup(); }
+  ~DxcDllSupport() { Cleanup(); }
 
-  HRESULT virtual Initialize() {
+  HRESULT Initialize() {
     return InitializeInternal(kDxCompilerLib, "DxcCreateInstance");
   }
 
-  HRESULT virtual InitializeForDll(LPCSTR dll, LPCSTR entryPoint) {
+  HRESULT InitializeForDll(LPCSTR dll, LPCSTR entryPoint) {
     return InitializeInternal(dll, entryPoint);
   }
 
@@ -104,8 +104,7 @@ class DxcDllSupport {
     return CreateInstance(clsid, __uuidof(TInterface), (IUnknown **)pResult);
   }
 
-  HRESULT virtual CreateInstance(REFCLSID clsid, REFIID riid,
-                                 IUnknown **pResult) {
+  HRESULT CreateInstance(REFCLSID clsid, REFIID riid, IUnknown **pResult) {
     if (pResult == nullptr)
       return E_POINTER;
     if (m_dll == nullptr)
@@ -121,7 +120,7 @@ class DxcDllSupport {
                            (IUnknown **)pResult);
   }
 
-  HRESULT virtual CreateInstance2(IMalloc *pMalloc, REFCLSID clsid, REFIID riid,
+  HRESULT CreateInstance2(IMalloc *pMalloc, REFCLSID clsid, REFIID riid,
                           IUnknown **pResult) {
     if (pResult == nullptr)
       return E_POINTER;
@@ -133,21 +132,11 @@ class DxcDllSupport {
     return hr;
   }
 
-  bool virtual HasCreateWithMalloc() const { return m_createFn2 != nullptr; }
+  bool HasCreateWithMalloc() const { return m_createFn2 != nullptr; }
 
   bool IsEnabled() const { return m_dll != nullptr; }
 
-  bool GetCreateInstanceProcs(DxcCreateInstanceProc *pCreateFn,
-                              DxcCreateInstance2Proc *pCreateFn2) const {
-    if (pCreateFn == nullptr || pCreateFn2 == nullptr ||
-         m_createFn == nullptr)
-        return false;
-    *pCreateFn = m_createFn;
-    *pCreateFn2 = m_createFn2;
-    return true;
-  }
-
-  void virtual Cleanup() {
+  void Cleanup() {
     if (m_dll != nullptr) {
       m_createFn = nullptr;
       m_createFn2 = nullptr;
@@ -160,7 +149,7 @@ class DxcDllSupport {
     }
   }
 
-  HMODULE virtual Detach() {
+  HMODULE Detach() {
     HMODULE hModule = m_dll;
     m_dll = nullptr;
     return hModule;

include/dxc/Support/dxcapi.use.h

@@ -10,7 +10,6 @@ add_llvm_library(LLVMDxcSupport
   WinAdapter.cpp
   WinIncludes.cpp
   WinFunctions.cpp
-  dxcapi.extval.cpp
   )
 
 #generate header with platform-specific library name

lib/DxcSupport/CMakeLists.txt

@@ -533,7 +533,7 @@ FileRunCommandPart::RunDxc(dxc::DxcDllSupport &DllSupport,
       // that the validator version is at least as high as the requested
       // version. When ValVerMajor is 0, validation cannot be run against
       // the module.
-      if (bValVerExplicit && opts.ValVerMajor != 0 && !bValVerExplicit)
+      if (bValVerExplicit && opts.ValVerMajor != 0 && !opts.DisableValidation)
         result = CheckDxilVer(DllSupport, opts.ValVerMajor, opts.ValVerMinor);
       if (result.AbortPipeline)
         return result;