Mesa (main): microsoft/spirv_to_dxil: use dxil_validator

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 0c5d772b717d833f0f9aca21e3d86f70fe76317e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0c5d772b717d833f0f9aca21e3d86f70fe76317e

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Tue Apr  5 11:29:19 2022 +0200

microsoft/spirv_to_dxil: use dxil_validator

This has one negative side-effect; we're no longer able to print
validation errors without dxcompiler.dll. I doubt that's a real problem,
but if it is, we should add this ability to dxil_validator instead of
having a second implementation here.

The reasons I didn't try adding this in the first place is:

1. This code seems a bit janky; it doesn't consult the "known"-variable
   to figure out if the encoding is OK, and it's lacking a fallback path
   in that case.
2. It seems unlikely that the compiler varies the encoding of the output
   in the first place; one of the two code-paths in here is probably
   untested.
3. Since dxil_validator leaves reporting to the call-site, we'd need to
   either add and output-encoding to the API (yuck), or re-encode the
   string to UTF-8 using WinAPI.

Right now, it seems questionable if fixing all of the above is worth it.

Reviewed-by: Boris Brezillon <boris.brezillon at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15751>

---

 src/microsoft/spirv_to_dxil/dxil_validation.cpp | 94 +++----------------------
 1 file changed, 8 insertions(+), 86 deletions(-)

diff --git a/src/microsoft/spirv_to_dxil/dxil_validation.cpp b/src/microsoft/spirv_to_dxil/dxil_validation.cpp
index 3c674eacb72..a8e012c0d11 100644
--- a/src/microsoft/spirv_to_dxil/dxil_validation.cpp
+++ b/src/microsoft/spirv_to_dxil/dxil_validation.cpp
@@ -27,98 +27,20 @@
 
 #if DETECT_OS_WINDOWS
 
-#include <windows.h>
-#include <wrl/client.h>
-
-#include "dxcapi.h"
-
-using Microsoft::WRL::ComPtr;
-
-class DxilBlob : public IDxcBlob {
- public:
-   DxilBlob(dxil_spirv_object *data) : m_data(data) {}
-
-   LPVOID STDMETHODCALLTYPE
-   GetBufferPointer() override
-   {
-      return m_data->binary.buffer;
-   }
-
-   SIZE_T STDMETHODCALLTYPE
-   GetBufferSize() override
-   {
-      return m_data->binary.size;
-   }
-
-   HRESULT STDMETHODCALLTYPE
-   QueryInterface(REFIID, void **) override
-   {
-      return E_NOINTERFACE;
-   }
-
-   ULONG STDMETHODCALLTYPE
-   AddRef() override
-   {
-      return 1;
-   }
-
-   ULONG STDMETHODCALLTYPE
-   Release() override
-   {
-      return 0;
-   }
-
-   dxil_spirv_object *m_data;
-};
+#include "dxil_validator.h"
 
 bool
 validate_dxil(dxil_spirv_object *dxil_obj)
 {
-   HMODULE dxil_dll = LoadLibraryA("dxil.dll");
-   if (!dxil_dll) {
-      fprintf(stderr, "Unable to load dxil.dll\n");
-      return false;
-   }
-   DxcCreateInstanceProc dxc_create_instance =
-      reinterpret_cast<DxcCreateInstanceProc>(
-         GetProcAddress(dxil_dll, "DxcCreateInstance"));
-
-   bool res = false;
-   DxilBlob blob(dxil_obj);
-   // Creating a block so that ComPtrs free before we call FreeLibrary
-   {
-      ComPtr<IDxcValidator> validator;
-      if (FAILED(dxc_create_instance(CLSID_DxcValidator,
-                                     IID_PPV_ARGS(&validator)))) {
-         fprintf(stderr, "Failed to create DxcValidator instance \n");
-         FreeLibrary(dxil_dll);
-         return false;
-      }
+   struct dxil_validator *val = dxil_create_validator(NULL);
 
-      ComPtr<IDxcOperationResult> result;
-      validator->Validate(&blob, DxcValidatorFlags_InPlaceEdit, &result);
-      HRESULT status;
-      result->GetStatus(&status);
-      if (FAILED(status)) {
-         ComPtr<IDxcBlobEncoding> error;
-         result->GetErrorBuffer(&error);
-         BOOL known = false;
-         uint32_t cp = 0;
-         error->GetEncoding(&known, &cp);
-         fprintf(stderr, "DXIL: ");
-         if (cp == CP_UTF8 || cp == CP_ACP) {
-            fprintf(stderr, "%s\n",
-                    static_cast<char *>(error->GetBufferPointer()));
-         } else {
-            fwprintf(stderr, L"%ls\n",
-                     static_cast<wchar_t *>(error->GetBufferPointer()));
-         }
-      } else {
-         res = true;
-      }
-   }
+   char *err;
+   bool res = dxil_validate_module(val, dxil_obj->binary.buffer,
+                                   dxil_obj->binary.size, &err);
+   if (!res && err)
+      fprintf(stderr, "DXIL: %s\n\n", err);
 
-   FreeLibrary(dxil_dll);
+   dxil_destroy_validator(val);
    return res;
 }