diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index 541f2dd4ec4bee3e9c0e0b23c0beafc125816733..0ac662e96b5d79b921f24932cc79c20543f1dab6 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -54,6 +54,15 @@
   script:
     - .gitlab-ci/meson/build.sh
 
+.meson-build_mingw:
+  extends:
+    - .build-linux
+    - .use-debian/x86_build_mingw
+    - .use-wine
+  stage: build-x86_64
+  script:
+    - .gitlab-ci/meson/build.sh
+
 debian-testing:
   extends:
     - .meson-build
@@ -513,18 +522,39 @@ debian-ppc64el:
     VULKAN_DRIVERS: "amd,swrast"
 
 debian-mingw32-x86_64:
-  extends: .meson-build
+  extends: .meson-build_mingw
   stage: build-misc
   variables:
     UNWIND: "disabled"
     C_ARGS: >
       -Wno-error=format
       -Wno-error=format-extra-args
+      -Wno-error=deprecated-declarations
+      -Wno-error=unused-function
+      -Wno-error=unused-variable
+      -Wno-error=unused-but-set-variable
+      -Wno-error=unused-value
+      -Wno-error=switch
+      -Wno-error=parentheses
+      -Wno-error=missing-prototypes
+      -Wno-error=sign-compare
+      -Wno-error=narrowing
+      -Wno-error=overflow
     CPP_ARGS: $C_ARGS
-    GALLIUM_DRIVERS: "swrast"
+    GALLIUM_DRIVERS: "swrast,d3d12,zink"
+    VULKAN_DRIVERS: "swrast,amd,microsoft-experimental"
+    GALLIUM_ST: >
+      -D gallium-opencl=icd
+      -D opencl-spirv=true
+      -D microsoft-clc=enabled
+      -D static-libclc=all
+      -D llvm=enabled
     EXTRA_OPTION: >
       -D spirv-to-dxil=true
-      -Dllvm=disabled
-      -Dzlib=disabled
-      -Dosmesa=true
+      -D gles1=enabled
+      -D gles2=enabled
+      -D osmesa=true
+      -D cpp_rtti=true
+      -D shared-glapi=enabled
+      -D zlib=enabled
       --cross-file=.gitlab-ci/x86_64-w64-mingw32
diff --git a/.gitlab-ci/container/debian/x86_build-base-wine.sh b/.gitlab-ci/container/debian/x86_build-base-wine.sh
new file mode 100644
index 0000000000000000000000000000000000000000..dec8f790cf47ab9bcc75a5b6a5cadb139a215a1d
--- /dev/null
+++ b/.gitlab-ci/container/debian/x86_build-base-wine.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+set -o xtrace
+
+# Installing wine, need this for testing mingw or nine
+
+# We need multiarch for Wine
+dpkg --add-architecture i386
+apt-get update
+apt-get install -y --no-remove \
+      wine \
+      wine32 \
+      wine64 \
+      xvfb
+
+# Used to initialize the Wine environment to reduce build time
+wine64 whoami.exe
+
diff --git a/.gitlab-ci/container/debian/x86_build-base.sh b/.gitlab-ci/container/debian/x86_build-base.sh
index 85a6a6f00028ce7e4c6b0dcc7c8018ddd828172e..0a56d479bf2e82e479367fc59141d8f725950297 100644
--- a/.gitlab-ci/container/debian/x86_build-base.sh
+++ b/.gitlab-ci/container/debian/x86_build-base.sh
@@ -25,7 +25,7 @@ apt-get install -y --no-remove \
         dpkg-cross \
         flex \
         g++ \
-        g++-mingw-w64-x86-64 \
+        cmake \
         gcc \
         git \
         glslang-tools \
@@ -54,7 +54,6 @@ apt-get install -y --no-remove \
         libxshmfence-dev \
         libxvmc-dev \
         libxxf86vm-dev \
-        libz-mingw-w64-dev \
         make \
         meson \
         pkg-config \
@@ -64,7 +63,6 @@ apt-get install -y --no-remove \
         qemu-user \
         valgrind \
         wget \
-        wine64 \
         x11proto-dri2-dev \
         x11proto-gl-dev \
         x11proto-randr-dev \
@@ -74,6 +72,8 @@ apt-get install -y --no-remove \
 # Needed for ci-fairy, this revision is able to upload files to MinIO
 pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade99434043f88e164933f570301fd18b125
 
+. .gitlab-ci/container/debian/x86_build-base-wine.sh
+
 ############### Uninstall ephemeral packages
 
 apt-get purge -y $STABLE_EPHEMERAL
diff --git a/.gitlab-ci/container/debian/x86_build-mingw-patch.sh b/.gitlab-ci/container/debian/x86_build-mingw-patch.sh
new file mode 100644
index 0000000000000000000000000000000000000000..6dbb743f9134cb8d71476e1172a6b43bdd9ec2a1
--- /dev/null
+++ b/.gitlab-ci/container/debian/x86_build-mingw-patch.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# Pull packages from msys2 repository that can be directly used.
+# We can use https://packages.msys2.org/ to retrieve the newest package
+mkdir ~/tmp
+pushd ~/tmp
+MINGW_PACKET_LIST="
+mingw-w64-x86_64-headers-git-10.0.0.r14.ga08c638f8-1-any.pkg.tar.zst
+mingw-w64-x86_64-vulkan-loader-1.3.211-1-any.pkg.tar.zst
+mingw-w64-x86_64-libelf-0.8.13-6-any.pkg.tar.zst
+mingw-w64-x86_64-zlib-1.2.12-1-any.pkg.tar.zst
+mingw-w64-x86_64-zstd-1.5.2-2-any.pkg.tar.zst
+"
+
+for i in $MINGW_PACKET_LIST
+do
+  wget -q --tries=3 https://mirror.msys2.org/mingw/mingw64/$i
+  tar xf $i --strip-components=1 -C /usr/x86_64-w64-mingw32/
+done
+popd
+rm -rf ~/tmp
+
+mkdir -p /usr/x86_64-w64-mingw32/bin
+
+# The output of `wine64 llvm-config --system-libs --cxxflags mcdisassembler`
+# containes absolute path like '-IZ:'
+# The sed is used to replace `-IZ:/usr/x86_64-w64-mingw32/include`
+# to `-I/usr/x86_64-w64-mingw32/include`
+
+# Debian's pkg-config wrapers for mingw are broken, and there's no sign that
+# they're going to be fixed, so we'll just have to fix it ourselves
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=930492
+cat >/usr/x86_64-w64-mingw32/bin/pkg-config <<EOF
+#!/bin/sh
+
+PKG_CONFIG_LIBDIR=/usr/x86_64-w64-mingw32/lib/pkgconfig:/usr/x86_64-w64-mingw32/share/pkgconfig pkg-config \$@
+EOF
+chmod +x /usr/x86_64-w64-mingw32/bin/pkg-config
+
+cat >/usr/x86_64-w64-mingw32/bin/llvm-config <<EOF
+#!/bin/sh
+wine64 llvm-config \$@ | sed -e "s,Z:/,/,gi"
+EOF
+chmod +x /usr/x86_64-w64-mingw32/bin/llvm-config
+
+cat >/usr/x86_64-w64-mingw32/bin/clang <<EOF
+#!/bin/sh
+wine64 clang \$@
+EOF
+chmod +x /usr/x86_64-w64-mingw32/bin/clang
+
+cat >/usr/x86_64-w64-mingw32/bin/llvm-as <<EOF
+#!/bin/sh
+wine64 llvm-as \$@
+EOF
+chmod +x /usr/x86_64-w64-mingw32/bin/llvm-as
+
+cat >/usr/x86_64-w64-mingw32/bin/llvm-link <<EOF
+#!/bin/sh
+wine64 llvm-link \$@
+EOF
+chmod +x /usr/x86_64-w64-mingw32/bin/llvm-link
+
+cat >/usr/x86_64-w64-mingw32/bin/opt <<EOF
+#!/bin/sh
+wine64 opt \$@
+EOF
+chmod +x /usr/x86_64-w64-mingw32/bin/opt
+
+cat >/usr/x86_64-w64-mingw32/bin/llvm-spirv <<EOF
+#!/bin/sh
+wine64 llvm-spirv \$@
+EOF
+chmod +x /usr/x86_64-w64-mingw32/bin/llvm-spirv
diff --git a/.gitlab-ci/container/debian/x86_build-mingw-source-deps.sh b/.gitlab-ci/container/debian/x86_build-mingw-source-deps.sh
new file mode 100644
index 0000000000000000000000000000000000000000..0fee1723da6059e20b2d1d2e125153067826572b
--- /dev/null
+++ b/.gitlab-ci/container/debian/x86_build-mingw-source-deps.sh
@@ -0,0 +1,100 @@
+#!/bin/bash
+wd=$PWD
+CMAKE_TOOLCHAIN_MINGW_PATH=$wd/.gitlab-ci/container/debian/x86_mingw-toolchain.cmake
+mkdir -p ~/tmp
+pushd ~/tmp
+
+# Building DirectX-Headers
+git clone https://github.com/microsoft/DirectX-Headers -b mesa-mingw --depth 1
+mkdir -p DirectX-Headers/build
+pushd DirectX-Headers/build
+meson .. \
+--backend=ninja \
+--buildtype=release -Dbuild-test=false \
+-Dprefix=/usr/x86_64-w64-mingw32/ \
+--cross-file=$wd/.gitlab-ci/x86_64-w64-mingw32
+
+ninja install
+popd
+
+export VULKAN_SDK_VERSION=1.3.211.0
+
+# Building SPIRV Tools
+git clone -b sdk-$VULKAN_SDK_VERSION --depth=1 \
+https://github.com/KhronosGroup/SPIRV-Tools SPIRV-Tools
+
+git clone -b sdk-$VULKAN_SDK_VERSION --depth=1 \
+https://github.com/KhronosGroup/SPIRV-Headers SPIRV-Tools/external/SPIRV-Headers
+
+mkdir -p SPIRV-Tools/build
+pushd SPIRV-Tools/build
+cmake .. \
+-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_MINGW_PATH \
+-DCMAKE_INSTALL_PREFIX=/usr/x86_64-w64-mingw32/ \
+-GNinja -DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_CROSSCOMPILING=1 \
+-DCMAKE_POLICY_DEFAULT_CMP0091=NEW
+
+ninja install
+popd
+
+# Building LLVM
+git clone -b release/14.x --depth=1 \
+https://github.com/llvm/llvm-project llvm-project
+
+git clone -b v14.0.0 --depth=1 \
+https://github.com/KhronosGroup/SPIRV-LLVM-Translator llvm-project/llvm/projects/SPIRV-LLVM-Translator
+
+mkdir llvm-project/build
+pushd llvm-project/build
+cmake ../llvm \
+-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_MINGW_PATH \
+-DCMAKE_INSTALL_PREFIX=/usr/x86_64-w64-mingw32/ \
+-GNinja -DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_CROSSCOMPILING=1 \
+-DLLVM_ENABLE_RTTI=ON \
+-DCROSS_TOOLCHAIN_FLAGS_NATIVE=-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=$PWD/../../SPIRV-Tools/external/SPIRV-Headers \
+-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=$PWD/../../SPIRV-Tools/external/SPIRV-Headers \
+-DLLVM_ENABLE_PROJECTS="clang;lld" \
+-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" \
+-DLLVM_OPTIMIZED_TABLEGEN=TRUE \
+-DLLVM_ENABLE_ASSERTIONS=TRUE \
+-DLLVM_INCLUDE_UTILS=OFF \
+-DLLVM_INCLUDE_RUNTIMES=OFF \
+-DLLVM_INCLUDE_TESTS=OFF \
+-DLLVM_INCLUDE_EXAMPLES=OFF \
+-DLLVM_INCLUDE_GO_TESTS=OFF \
+-DLLVM_INCLUDE_BENCHMARKS=OFF \
+-DLLVM_BUILD_LLVM_C_DYLIB=OFF \
+-DLLVM_ENABLE_DIA_SDK=OFF \
+-DCLANG_BUILD_TOOLS=ON \
+-DLLVM_SPIRV_INCLUDE_TESTS=OFF
+
+ninja install
+popd
+
+# Building libclc
+mkdir llvm-project/build-libclc
+pushd llvm-project/build-libclc
+cmake ../libclc \
+-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_MINGW_PATH \
+-DCMAKE_INSTALL_PREFIX=/usr/x86_64-w64-mingw32/ \
+-GNinja -DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_CROSSCOMPILING=1 \
+-DCMAKE_POLICY_DEFAULT_CMP0091=NEW \
+-DCMAKE_CXX_FLAGS="-m64" \
+-DLLVM_CONFIG="/usr/x86_64-w64-mingw32/bin/llvm-config" \
+-DLLVM_CLANG="/usr/x86_64-w64-mingw32/bin/clang" \
+-DLLVM_AS="/usr/x86_64-w64-mingw32/bin/llvm-as" \
+-DLLVM_LINK="/usr/x86_64-w64-mingw32/bin/llvm-link" \
+-DLLVM_OPT="/usr/x86_64-w64-mingw32/bin/opt" \
+-DLLVM_SPIRV="/usr/x86_64-w64-mingw32/bin/llvm-spirv" \
+-DLIBCLC_TARGETS_TO_BUILD="spirv-mesa3d-;spirv64-mesa3d-"
+
+ninja install
+popd
+
+popd # ~/tmp
+
+# Cleanup ~/tmp
+rm -rf ~/tmp
diff --git a/.gitlab-ci/container/debian/x86_build-mingw.sh b/.gitlab-ci/container/debian/x86_build-mingw.sh
new file mode 100644
index 0000000000000000000000000000000000000000..34630e45a466107b70db1800a731f244dbcb6ae6
--- /dev/null
+++ b/.gitlab-ci/container/debian/x86_build-mingw.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+set -o xtrace
+
+apt-get update
+apt-get install -y --no-remove \
+        zstd \
+        g++-mingw-w64-i686 \
+        g++-mingw-w64-x86-64
+
+. .gitlab-ci/container/debian/x86_build-mingw-patch.sh
+. .gitlab-ci/container/debian/x86_build-mingw-source-deps.sh
diff --git a/.gitlab-ci/container/debian/x86_build.sh b/.gitlab-ci/container/debian/x86_build.sh
index 1c1f9f7b6be19cc8e0e36cd27498a1b2872994fb..e2695564ea5f4c4c415fe8d7946a8b5a3ee0a25d 100644
--- a/.gitlab-ci/container/debian/x86_build.sh
+++ b/.gitlab-ci/container/debian/x86_build.sh
@@ -15,15 +15,12 @@ STABLE_EPHEMERAL=" \
       python3-pip \
       "
 
-# We need multiarch for Wine
-dpkg --add-architecture i386
 apt-get update
 
 apt-get install -y --no-remove \
       $STABLE_EPHEMERAL \
       check \
       clang \
-      cmake \
       libasan6 \
       libarchive-dev \
       libclang-cpp11-dev \
@@ -49,25 +46,11 @@ apt-get install -y --no-remove \
       procps \
       spirv-tools \
       strace \
-      time \
-      wine \
-      wine32
+      time
 
 
 . .gitlab-ci/container/container_pre_build.sh
 
-
-# Debian's pkg-config wrapers for mingw are broken, and there's no sign that
-# they're going to be fixed, so we'll just have to fix it ourselves
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=930492
-cat >/usr/local/bin/x86_64-w64-mingw32-pkg-config <<EOF
-#!/bin/sh
-
-PKG_CONFIG_LIBDIR=/usr/x86_64-w64-mingw32/lib/pkgconfig pkg-config \$@
-EOF
-chmod +x /usr/local/bin/x86_64-w64-mingw32-pkg-config
-
-
 # dependencies where we want a specific version
 export              XORG_RELEASES=https://xorg.freedesktop.org/releases/individual
 
@@ -89,10 +72,9 @@ cd shader-db
 make
 popd
 
-git clone https://github.com/microsoft/DirectX-Headers -b v1.602.0-r1 --depth 1
-pushd DirectX-Headers
-mkdir build
-cd build
+git clone https://github.com/microsoft/DirectX-Headers -b mesa-mingw --depth 1
+mkdir -p DirectX-Headers/build
+pushd DirectX-Headers/build
 meson .. --backend=ninja --buildtype=release -Dbuild-test=false
 ninja
 ninja install
diff --git a/.gitlab-ci/container/debian/x86_mingw-toolchain.cmake b/.gitlab-ci/container/debian/x86_mingw-toolchain.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..70da12d38449dd76df60deb778371e747e2264eb
--- /dev/null
+++ b/.gitlab-ci/container/debian/x86_mingw-toolchain.cmake
@@ -0,0 +1,8 @@
+set(CMAKE_SYSTEM_NAME Windows)
+set(CMAKE_SYSTEM_PROCESSOR x86_64)
+
+set(CMAKE_SYSROOT /usr/x86_64-w64-mingw32/)
+set(ENV{PKG_CONFIG} /usr/x86_64-w64-mingw32/bin/pkg-config)
+
+set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc-posix)
+set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++-posix)
diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index 38e317d884d9e5c21eeab8cd3d36c3b3be89966c..aba81335deb63433142e155cbba06d977449e4d6 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -23,6 +23,9 @@
   variables:
     MESA_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${FDO_DISTRIBUTION_TAG}"
 
+.use-wine:
+  variables:
+    WINEPATH: "/usr/x86_64-w64-mingw32/bin;/usr/x86_64-w64-mingw32/lib;/usr/lib/gcc/x86_64-w64-mingw32/10-posix;c:/windows;c:/windows/system32"
 
 # Build the CI docker images.
 #
@@ -46,10 +49,11 @@
   extends:
     - .container-rules
     - .incorporate-templates-commit
+    - .use-wine
   variables:
     FDO_DISTRIBUTION_VERSION: bullseye-slim
     FDO_REPO_SUFFIX: $CI_JOB_NAME
-    FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
+    FDO_DISTRIBUTION_EXEC: 'env "WINEPATH=${WINEPATH}" FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
     # no need to pull the whole repo to build the container image
     GIT_STRATEGY: none
 
@@ -113,6 +117,23 @@ debian/i386_build:
   needs:
     - debian/i386_build
 
+# Debian 11 based x86-mingw cross main build image
+debian/x86_build-mingw:
+  extends:
+    - .use-debian/x86_build-base
+  variables:
+    MESA_IMAGE_TAG: &debian-x86_build_mingw ${DEBIAN_BUILD_MINGW_TAG}
+
+.use-debian/x86_build_mingw:
+  extends:
+    - .set-image-base-tag
+  variables:
+    MESA_BASE_TAG: *debian-x86_build-base
+    MESA_IMAGE_PATH: ${DEBIAN_X86_BUILD_MINGW_IMAGE_PATH}
+    MESA_IMAGE_TAG: *debian-x86_build_mingw
+  needs:
+    - debian/x86_build-mingw
+
 # Debian 11 based ppc64el cross-build image
 debian/ppc64el_build:
   extends:
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 1f0b6e70227742aa8cf085c6ee7fe5b748cfa74b..f93768ec924f8d783465fe6c0c19b25e73ac13d0 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -1,9 +1,12 @@
 variables:
    DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base"
-   DEBIAN_BASE_TAG: "2022-04-24-libdrm"
+   DEBIAN_BASE_TAG: "2022-06-16-Debian-MinGW"
 
    DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
-   DEBIAN_BUILD_TAG: "2022-05-12-DirectX-Headers"
+   DEBIAN_BUILD_TAG: "2022-06-16-Debian-MinGW"
+
+   DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw"
+   DEBIAN_BUILD_MINGW_TAG: "2022-06-16-Debian-MinGW"
 
    DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"
 
diff --git a/.gitlab-ci/meson/build.sh b/.gitlab-ci/meson/build.sh
index 43255b89e3112780b5c318abeacedad82ed33822..2d22df886f12332ba239f8859b3d71c6ae065b3c 100755
--- a/.gitlab-ci/meson/build.sh
+++ b/.gitlab-ci/meson/build.sh
@@ -48,6 +48,8 @@ case $CI_JOB_NAME in
         if test -f /usr/bin/time; then
             MESON_TEST_ARGS+=--wrapper=$PWD/.gitlab-ci/meson/time.sh
         fi
+        Xvfb :0 -screen 0 1024x768x16 &
+        export DISPLAY=:0.0
         ;;
     *)
         if test -f /usr/bin/time -a -f /usr/bin/strace; then
diff --git a/.gitlab-ci/x86_64-w64-mingw32 b/.gitlab-ci/x86_64-w64-mingw32
index 4db606e2bf73d5c86c811c66544aefc2a768b354..e17ddf47681d390dcaf6659d73b80ac59719cc34 100644
--- a/.gitlab-ci/x86_64-w64-mingw32
+++ b/.gitlab-ci/x86_64-w64-mingw32
@@ -1,9 +1,10 @@
 [binaries]
-c = ['ccache', 'x86_64-w64-mingw32-gcc']
-cpp = ['ccache', 'x86_64-w64-mingw32-g++']
+c = ['ccache', 'x86_64-w64-mingw32-gcc-posix']
+cpp = ['ccache', 'x86_64-w64-mingw32-g++-posix']
 ar = 'x86_64-w64-mingw32-ar'
 strip = 'x86_64-w64-mingw32-strip'
-pkgconfig = '/usr/local/bin/x86_64-w64-mingw32-pkg-config'
+pkgconfig = '/usr/x86_64-w64-mingw32/bin/pkg-config'
+llvm-config = '/usr/x86_64-w64-mingw32/bin/llvm-config'
 windres = 'x86_64-w64-mingw32-windres'
 exe_wrapper = ['wine64']
 
diff --git a/src/gallium/drivers/d3d12/d3d12_format.h b/src/gallium/drivers/d3d12/d3d12_format.h
index 3f5054b4776b1e179a3e06cc5711a66c6cb7886b..c6f45633bd3e293e77cd95f6d79ef64efd1b1d18 100644
--- a/src/gallium/drivers/d3d12/d3d12_format.h
+++ b/src/gallium/drivers/d3d12/d3d12_format.h
@@ -24,12 +24,9 @@
 #ifndef D3D12_FORMATS_H
 #define D3D12_FORMATS_H
 
+#include "d3d12_common.h"
+
 #include <directx/dxgiformat.h>
-#ifdef _WIN32
-#include <Windows.h>
-#else
-#include <wsl/winadapter.h>
-#endif
 #include <directx/dxgicommon.h>
 
 #include "pipe/p_format.h"
diff --git a/src/gallium/drivers/d3d12/d3d12_video_enc_h264.cpp b/src/gallium/drivers/d3d12/d3d12_video_enc_h264.cpp
index 5cdb84f5cbf44f8bdabc2a5364bd74c613bd5c93..3ceceb12dae9be0687329c2e99dd974c5f97fe46 100644
--- a/src/gallium/drivers/d3d12/d3d12_video_enc_h264.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_video_enc_h264.cpp
@@ -113,7 +113,7 @@ d3d12_video_encoder_update_current_frame_pic_params_info_h264(struct d3d12_video
 {
    struct pipe_h264_enc_picture_desc *h264Pic = (struct pipe_h264_enc_picture_desc *) picture;
    d3d12_video_bitstream_builder_h264 *pH264BitstreamBuilder =
-      dynamic_cast<d3d12_video_bitstream_builder_h264 *>(pD3D12Enc->m_upBitstreamBuilder.get());
+      static_cast<d3d12_video_bitstream_builder_h264 *>(pD3D12Enc->m_upBitstreamBuilder.get());
    assert(pH264BitstreamBuilder != nullptr);
 
    bUsedAsReference = !h264Pic->not_referenced;
@@ -774,7 +774,7 @@ d3d12_video_encoder_build_codec_headers_h264(struct d3d12_video_encoder *pD3D12E
                            D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAG_RESOLUTION_CHANGE) != 0);
 
    d3d12_video_bitstream_builder_h264 *pH264BitstreamBuilder =
-      dynamic_cast<d3d12_video_bitstream_builder_h264 *>(pD3D12Enc->m_upBitstreamBuilder.get());
+      static_cast<d3d12_video_bitstream_builder_h264 *>(pD3D12Enc->m_upBitstreamBuilder.get());
    assert(pH264BitstreamBuilder);
 
    uint32_t active_seq_parameter_set_id = pH264BitstreamBuilder->get_active_sps_id();
diff --git a/src/gallium/targets/libgl-gdi/meson.build b/src/gallium/targets/libgl-gdi/meson.build
index 1edb4a1ff59bd9c26b7ceb87bd2dcfe4ce73914d..e344090e2e7f96f8932e5dd584c7078c1005cf48 100644
--- a/src/gallium/targets/libgl-gdi/meson.build
+++ b/src/gallium/targets/libgl-gdi/meson.build
@@ -68,21 +68,18 @@ if with_tests
     dependencies : [idep_gtest, dep_dxheaders, extra_test_deps],
   )
 
-  # The CI pipeline for MinGW doesn't support creating a window, so don't run these tests there
-  if with_tests and cc.get_id() != 'gcc'
-    wgl_test_env = environment()
-    wgl_test_env.append('PATH', libgallium_wgl_build_dir)
-    if with_shared_glapi
-      wgl_test_env.append('PATH', libglapi_build_dir)
-    endif
-
-    test(
-      'wgl',
-      test_wgl,
-      suite : ['wgl'],
-      env : wgl_test_env,
-      depends : [libopengl32],
-      protocol : gtest_test_protocol,
-    )
+  wgl_test_env = environment()
+  wgl_test_env.append('PATH', libgallium_wgl_build_dir)
+  if with_shared_glapi
+    wgl_test_env.append('PATH', libglapi_build_dir)
   endif
+
+  test(
+    'wgl',
+    test_wgl,
+    suite : ['wgl'],
+    env : wgl_test_env,
+    depends : [libopengl32],
+    protocol : gtest_test_protocol,
+  )
 endif
diff --git a/src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp b/src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp
index 8dd65dcc7bb5a103a5f193b6fe77667fb523ba18..90e9ec929429117c0e3983993aa93b7cf1e5ca31 100644
--- a/src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp
+++ b/src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp
@@ -23,6 +23,8 @@
 
 #include "d3d12_wgl_public.h"
 
+#include <new>
+
 #include <windows.h>
 #include <dxgi1_4.h>
 #include <directx/d3d12.h>
diff --git a/src/microsoft/clc/clc_compiler_test.cpp b/src/microsoft/clc/clc_compiler_test.cpp
index f84565f4b6fc8790057cac87231f88c22a718707..4a02e39cf7cf49d50da7ef3af278732d0d1dba62 100644
--- a/src/microsoft/clc/clc_compiler_test.cpp
+++ b/src/microsoft/clc/clc_compiler_test.cpp
@@ -559,7 +559,7 @@ TEST_F(ComputeTest, DISABLED_complex_types_local_array_long)
       inout[idx] = tmp[idx];\n\
    }\n";
    auto inout = ShaderArg<uint64_t>({ 0, 0, 0, 0 }, SHADER_ARG_INOUT);
-   const uint16_t expected[] = {
+   const uint64_t expected[] = {
       0x00000000, 0x10000001, 0x20000020, 0x30000300,
    };
    run_shader(kernel_source, inout.size(), 1, 1, inout);
diff --git a/src/microsoft/clc/meson.build b/src/microsoft/clc/meson.build
index 504a7867dbc3fc8e29dd161fddff5814aa8cb663..966c17b43f32f5348f6f65637487517e4732cae7 100644
--- a/src/microsoft/clc/meson.build
+++ b/src/microsoft/clc/meson.build
@@ -42,5 +42,8 @@ if dep_dxheaders.found()
     include_directories : [inc_include, inc_src, inc_compiler, inc_spirv],
   )
 
-  test('clc_compiler_test', clc_compiler_test, timeout: 180, protocol : gtest_test_protocol)
+  if build_machine.system() == 'windows'
+    test('clc_compiler_test', clc_compiler_test, timeout: 180, protocol : gtest_test_protocol)
+  endif
+
 endif
diff --git a/src/microsoft/vulkan/dzn_pipeline.c b/src/microsoft/vulkan/dzn_pipeline.c
index 6eab6abe13f2aa2e9bcd4fa28f3dffc7128a57a3..b3a5997009c41b5aec06ee2f9a73f432c25153ad 100644
--- a/src/microsoft/vulkan/dzn_pipeline.c
+++ b/src/microsoft/vulkan/dzn_pipeline.c
@@ -1377,7 +1377,7 @@ dzn_graphics_pipeline_get_state(struct dzn_graphics_pipeline *pipeline,
 
       HRESULT hres = ID3D12Device2_CreatePipelineState(device->dev, &stream_desc,
                                                        &IID_ID3D12PipelineState,
-                                                       &variant->state);
+                                                       (void**)(&variant->state));
       assert(!FAILED(hres));
       he = _mesa_hash_table_insert(pipeline->variants, &variant->key, variant);
       assert(he);