Mesa (main): microsoft/clc: Fixes compiling of microsoft clc with mingw

[GitLab Mirror]

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

Author: Yonggang Luo <luoyonggang at gmail.com>
Date:   Thu May  5 19:29:37 2022 +0800

microsoft/clc: Fixes compiling of microsoft clc with mingw

Signed-off-by: Yonggang Luo <luoyonggang at gmail.com>
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16767>

---

 src/microsoft/clc/clc_compiler.c        | 4 ++--
 src/microsoft/clc/clc_compiler_test.cpp | 3 +++
 src/microsoft/clc/compute_test.cpp      | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/microsoft/clc/clc_compiler.c b/src/microsoft/clc/clc_compiler.c
index c21a93e9b01..ad59c0ebf1e 100644
--- a/src/microsoft/clc/clc_compiler.c
+++ b/src/microsoft/clc/clc_compiler.c
@@ -53,7 +53,7 @@ struct clc_image_lower_context
 static int
 lower_image_deref_impl(nir_builder *b, struct clc_image_lower_context *context,
                        const struct glsl_type *new_var_type,
-                       enum nir_variable_mode var_mode,
+                       nir_variable_mode var_mode,
                        unsigned *num_bindings)
 {
    nir_variable *in_var = nir_deref_instr_get_variable(context->deref);
@@ -150,7 +150,7 @@ clc_lower_input_image_deref(nir_builder *b, struct clc_image_lower_context *cont
 
          if (src->parent_instr->type == nir_instr_type_intrinsic) {
             nir_intrinsic_instr *intrinsic = nir_instr_as_intrinsic(src->parent_instr);
-            enum nir_alu_type dest_type;
+            nir_alu_type dest_type;
 
             b->cursor = nir_before_instr(&intrinsic->instr);
 
diff --git a/src/microsoft/clc/clc_compiler_test.cpp b/src/microsoft/clc/clc_compiler_test.cpp
index 023b2dadbe4..f84565f4b6f 100644
--- a/src/microsoft/clc/clc_compiler_test.cpp
+++ b/src/microsoft/clc/clc_compiler_test.cpp
@@ -21,15 +21,18 @@
  * IN THE SOFTWARE.
  */
 
+#include <cmath>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdexcept>
 #include <vector>
 
+#include <unknwn.h>
 #include <directx/d3d12.h>
 #include <dxgi1_4.h>
 #include <gtest/gtest.h>
 #include <wrl.h>
+#include <dxguids/dxguids.h>
 
 #include "compute_test.h"
 
diff --git a/src/microsoft/clc/compute_test.cpp b/src/microsoft/clc/compute_test.cpp
index 8fe6ae5fc31..07543e1bd3b 100644
--- a/src/microsoft/clc/compute_test.cpp
+++ b/src/microsoft/clc/compute_test.cpp
@@ -25,10 +25,12 @@
 #include <stdint.h>
 #include <stdexcept>
 
+#include <unknwn.h>
 #include <directx/d3d12.h>
 #include <dxgi1_4.h>
 #include <gtest/gtest.h>
 #include <wrl.h>
+#include <dxguids/dxguids.h>
 
 #include "util/u_debug.h"
 #include "clc_compiler.h"
@@ -208,7 +210,7 @@ ComputeTest::create_root_signature(const ComputeTest::Resources &resources)
    if (FAILED(dev->CreateRootSignature(0,
        sig->GetBufferPointer(),
        sig->GetBufferSize(),
-       __uuidof(ret),
+       __uuidof(ID3D12RootSignature),
        (void **)& ret)))
       throw runtime_error("CreateRootSignature failed");
 
@@ -225,7 +227,7 @@ ComputeTest::create_pipeline_state(ComPtr<ID3D12RootSignature> &root_sig,
 
    ComPtr<ID3D12PipelineState> pipeline_state;
    if (FAILED(dev->CreateComputePipelineState(&pipeline_desc,
-                                              __uuidof(pipeline_state),
+                                              __uuidof(ID3D12PipelineState),
                                               (void **)& pipeline_state)))
       throw runtime_error("Failed to create pipeline state");
    return pipeline_state;