almost almost

Author: bob80905

include/dxc/Support/dxcapi.extval.h

@@ -0,0 +1,51 @@
+#include "dxc/Support/dxcapi.use.h"
+#include "dxc/dxcapi.h"
+
+using dxc::DxcDllSupport;
+
+class DxcDllExtValidationSupport : public DxcDllSupport {
+  // DxcDllExtValidationSupport manages the
+  // lifetime of dxcompiler.dll, while the member, m_DxilSupport,
+  // manages the lifetime of dxil.dll
+  DxcDllSupport m_DxilSupport;
+
+  std::string DxilDllPath;
+  // override DxcDllSupport's implementation of InitializeInternal,
+  // adding the environment variable value check for a path to a dxil.dll
+  HRESULT InitializeInternal(LPCSTR dllName, LPCSTR fnName);
+
+  std::string GetDxilDLLPathExt() { return DxilDllPath; }
+  bool DxilDllSuccessfullyLoaded() {
+    return !DxilDllPath.empty() && !m_DxilSupport.IsEnabled();
+  }
+
+  HRESULT InitializeInternal(LPCSTR dllName, LPCSTR fnName) {
+    // Load dxcompiler.dll
+    HRESULT result = InitializeForDll(dllName, fnName);
+    // if dxcompiler.dll fails to load, then we won't try loading dxil.dll,
+    // so set this boolean to false.
+
+    // now handle external dxil.dll
+    const char *envVal = std::getenv("DXC_DXIL_DLL_PATH");
+    bool ValidateInternally = false;
+    if (!envVal || std::string(envVal).empty()) {
+      return S_OK;
+    }
+
+    std::string DllPathStr(envVal);
+    DxilDllPath = DllPathStr;
+    std::filesystem::path DllPath(DllPathStr);
+
+    // Check if path is absolute and exists
+    if (!DllPath.is_absolute() || !std::filesystem::exists(DllPath)) {
+      return S_OK;
+    }
+    // code that calls this function is responsible for checking
+    // to see if dxil.dll is successfully loaded.
+    // the CheckDxilDLLLoaded function can determine whether there were any
+    // problems loading dxil.dll or not
+    m_DxilSupport.InitializeForDll(DllPathStr.data(), fnName);
+
+    return S_OK;
+  }
+};

include/dxc/Support/dxcapi.use.h

@@ -135,9 +135,9 @@ class DxcDllSupport {
 
   bool virtual HasCreateWithMalloc() const { return m_createFn2 != nullptr; }
 
-  bool virtual IsEnabled() const { return m_dll != nullptr; }
+  bool IsEnabled() const { return m_dll != nullptr; }
 
-  bool virtual GetCreateInstanceProcs(DxcCreateInstanceProc *pCreateFn,
+  bool GetCreateInstanceProcs(DxcCreateInstanceProc *pCreateFn,
                               DxcCreateInstance2Proc *pCreateFn2) const {
     if (pCreateFn == nullptr || pCreateFn2 == nullptr ||
          m_createFn == nullptr)
@@ -193,64 +193,6 @@ void WriteOperationErrorsToConsole(IDxcOperationResult *pResult,
 void WriteOperationResultToConsole(IDxcOperationResult *pRewriteResult,
                                    bool outputWarnings);
 
-class DxcDllExtValidationSupport : public DxcDllSupport {
-  // DxcDllExtValidationSupport manages the
-  // lifetime of dxcompiler.dll, while the member, m_DxilSupport,
-  // manages the lifetime of dxil.dll
-  DxcDllSupport *m_DxilSupport = nullptr;
-
-  std::string DxilDLLPathExt = "";
-  bool ExternalDxilDLLInitializationSuccess = false;
-  // override DxcDllSupport's implementation of InitializeInternal,
-  // adding the environment variable value check for a path to a dxil.dll
-  // for external validation
-  HRESULT InitializeInternal(LPCSTR dllName, LPCSTR fnName){
-
-    // Load dxcompiler.dll
-    HRESULT result = InitializeForDll(dllName, fnName);
-    // if dxcompiler.dll fails to load, then we won't try loading dxil.dll,
-    // so set this boolean to false.
-    ExternalDxilDLLInitializationSuccess = DXC_FAILED(result) ? false : true;
-    if (!ExternalDxilDLLInitializationSuccess) {
-      return result;
-    }
-
-    // now handle external dxil.dll
-    const char *envVal = std::getenv("DXC_DXIL_DLL_PATH");
-    bool ValidateInternally = false;
-    if (!envVal || std::string(envVal).empty()) {
-      ValidateInternally = true;
-    }
-
-    if (!ValidateInternally){
-      std::string DllPathStr(envVal);
-      DxilDLLPathExt = DllPathStr;
-      std::filesystem::path DllPath(DllPathStr);
-
-      // Check if path is absolute and exists
-      if (!DllPath.is_absolute() || !std::filesystem::exists(DllPath)) {
-        ExternalDxilDLLInitializationSuccess = false;
-        // TODO: Ideally emit some diagnostic that the given absolute path doesn't exist
-        return HRESULT_FROM_WIN32(GetLastError());
-      }
-      result = m_DxilSupport->InitializeForDll(DllPathStr.data(), fnName);
-      if (DXC_FAILED(result)) {
-        ExternalDxilDLLInitializationSuccess = false;
-        return result;
-      }
-      ExternalDxilDLLInitializationSuccess = true;
-    } else {
-      // nothing to do if we are validating internally, dxcompiler.dll
-      // is loaded and it'll take care of validation.
-      // No external dxil.dll will be loaded in this case
-      ExternalDxilDLLInitializationSuccess = false;
-    }
-    return S_OK;
-  }
-
-  std::string GetDxilDLLPathExt() { return DxilDLLPathExt; }
-
-};
 } // namespace dxc
 
 #endif

lib/DxcSupport/CMakeLists.txt

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

lib/DxcSupport/dxcapi.extval.cpp

@@ -0,0 +1 @@
+

tools/clang/tools/dxcompiler/CMakeLists.txt

@@ -57,7 +57,6 @@ set(SOURCES
   DXCompiler.rc
   DXCompiler.def
   dxcfilesystem.cpp
-  dxillib.cpp
   dxcutil.cpp
   dxcdisassembler.cpp
   dxcpdbutils.cpp
@@ -75,7 +74,6 @@ set(SOURCES
   dxcutil.cpp
   dxcdisassembler.cpp
   dxcpdbutils.cpp
-  dxillib.cpp
   dxcvalidator.cpp
   dxclinker.cpp
   dxcshadersourceinfo.cpp

tools/clang/tools/dxcompiler/DXCompiler.cpp

@@ -19,7 +19,6 @@
 #ifdef LLVM_ON_WIN32
 #include "dxcetw.h"
 #endif
-#include "dxillib.h"
 
 namespace hlsl {
 HRESULT SetupRegistryPassForHLSL();

tools/clang/tools/dxcompiler/dxcapi.cpp

@@ -25,7 +25,6 @@
 #include "dxcetw.h"
 #endif
 #include "dxc/DxilContainer/DxcContainerBuilder.h"
-#include "dxillib.h"
 #include <memory>
 
 HRESULT CreateDxcCompiler(REFIID riid, _Out_ LPVOID *ppv);
@@ -60,8 +59,9 @@ HRESULT CreateDxcContainerBuilder(REFIID riid, _Out_ LPVOID *ppv) {
   // Call dxil.dll's containerbuilder
   *ppv = nullptr;
   const char *warning;
-  HRESULT hr = DxilLibCreateInstance(CLSID_DxcContainerBuilder,
-                                     (IDxcContainerBuilder **)ppv);
+  HRESULT hr =
+      S_OK; // originally: DxilLibCreateInstance(CLSID_DxcContainerBuilder,
+            // (IDxcContainerBuilder **)ppv);
   if (FAILED(hr)) {
     warning = "Unable to create container builder from dxil.dll. Resulting "
               "container will not be signed.\n";

tools/clang/tools/dxcompiler/dxcassembler.cpp

@@ -19,7 +19,6 @@
 #include "dxc/Support/dxcfilesystem.h"
 #include "dxc/Support/microcom.h"
 #include "dxcutil.h"
-#include "dxillib.h"
 
 #include "llvm/Bitcode/ReaderWriter.h"
 #include "llvm/IR/LLVMContext.h"

tools/clang/tools/dxcompiler/dxclinker.cpp

@@ -18,7 +18,6 @@
 #include "dxc/Support/dxcapi.impl.h"
 #include "dxc/Support/microcom.h"
 #include "dxc/dxcapi.h"
-#include "dxillib.h"
 
 #include "llvm/ADT/SmallVector.h"
 #include <algorithm>

tools/clang/tools/dxcompiler/dxcompilerobj.cpp

@@ -56,7 +56,6 @@
 #include "dxcompileradapter.h"
 #include "dxcshadersourceinfo.h"
 #include "dxcversion.inc"
-#include "dxillib.h"
 #include <algorithm>
 #include <cfloat>
 
@@ -1322,7 +1321,7 @@ class DxcCompiler : public IDxcCompiler3,
       std::string msg("Internal Compiler error: ");
       switch (hr) {
       case DXC_E_VALIDATOR_MISSING:
-        msg = "Error: external validator selected, but DXIL.dll not found.";
+        msg = "Error: DXIL.dll not found.";
         break;
       default:
         break;