diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8a4c577d463ab1ebce8b25940c514d97c6033f7..403ce278b36565bc64ddd357b733d9c1e73f5ced 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -570,7 +570,7 @@ debian/arm_test:
   variables:
     MESA_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}"
     MESA_IMAGE_PATH: "windows/x64_build"
-    MESA_IMAGE_TAG: "2021-11-19-piglit-uprev"
+    MESA_IMAGE_TAG: "2021-12-03-piglit-waffle"
     MESA_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MESA_IMAGE_PATH:${MESA_IMAGE_TAG}"
 
 windows_build_vs2019:
diff --git a/.gitlab-ci/windows/mesa_deps.ps1 b/.gitlab-ci/windows/mesa_deps.ps1
index 597aed15b724be2b9566fd45c86f390e879d6968..297cc85c795786095cfafc6d379d27735c71b770 100644
--- a/.gitlab-ci/windows/mesa_deps.ps1
+++ b/.gitlab-ci/windows/mesa_deps.ps1
@@ -141,29 +141,27 @@ if (!$?) {
 Remove-Item C:\vulkan-runtime.exe -Force
 
 Get-Date
-Write-Host "Downloading Freeglut"
+Write-Host "Cloning Waffle"
 
-$freeglut_zip = 'freeglut-MSVC.zip'
-$freeglut_url = "https://www.transmissionzero.co.uk/files/software/development/GLUT/$freeglut_zip"
-
-For ($i = 0; $i -lt 5; $i++) {
-  Invoke-WebRequest -Uri $freeglut_url -OutFile $freeglut_zip
-  $freeglut_downloaded = $?
-  if ($freeglut_downloaded) {
-    Break
-  }
-}
-
-if (!$freeglut_downloaded) {
-  Write-Host "Failed to download Freeglut"
+git clone --no-progress --single-branch --no-checkout https://gitlab.freedesktop.org/mesa/waffle.git 'C:\src\waffle'
+if (!$?) {
+  Write-Host "Failed to clone Waffle repository"
   Exit 1
 }
+Push-Location -Path C:\src\waffle
+git checkout 950a1f35a718bc2a8e1dda75845e52651bb331a7
+Pop-Location
 
 Get-Date
-Write-Host "Installing Freeglut"
-Expand-Archive $freeglut_zip -DestinationPath C:\
-if (!$?) {
-  Write-Host "Failed to install Freeglut"
+$waffle_build = New-Item -ItemType Directory -Path "C:\src\waffle" -Name "build"
+Push-Location -Path $waffle_build.FullName
+Write-Host "Compiling Waffle"
+cmd.exe /C 'C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && meson .. --buildtype=release --default-library=static --prefix="C:\Waffle" && ninja -j32 install'
+$buildstatus = $?
+Pop-Location
+Remove-Item -Recurse -Path $waffle_build
+if (!$buildstatus) {
+  Write-Host "Failed to compile or install Waffle"
   Exit 1
 }
 
@@ -181,14 +179,14 @@ if (!$?) {
   Exit 1
 }
 Push-Location -Path C:\src\piglit
-git checkout f7f2a6c2275cae023a27b6cc81be3dda8c99492d
+git checkout efa64335e22f1af0277f4d4dd7629e8674875490
 Pop-Location
 
 Get-Date
 $piglit_build = New-Item -ItemType Directory -Path "C:\src\piglit" -Name "build"
 Push-Location -Path $piglit_build.FullName
 Write-Host "Compiling Piglit"
-cmd.exe /C 'C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="C:\Piglit" -DGLUT_INCLUDE_DIR=C:\freeglut\include -DGLUT_glut_LIBRARY_RELEASE=C:\freeglut\lib\x64\freeglut.lib -DGLEXT_INCLUDE_DIR=.\glext && ninja -j32'
+cmd.exe /C 'C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="C:\Piglit" -DPIGLIT_USE_WAFFLE=ON -DWaffle_INCLUDE_DIRS="C:\Waffle\include\waffle-1" -DWaffle_LDFLAGS="C:\Waffle\lib\libwaffle-1.a" -DGLEXT_INCLUDE_DIR=.\glext && ninja -j32'
 $buildstatus = $?
 ninja -j32 install | Out-Null
 $installstatus = $?
@@ -199,8 +197,6 @@ if (!$buildstatus -Or !$installstatus) {
   Exit 1
 }
 
-Copy-Item -Path C:\freeglut\bin\x64\freeglut.dll -Destination C:\Piglit\lib\piglit\bin\freeglut.dll
-
 Get-Date
 Write-Host "Cloning spirv-samples"
 git clone --no-progress --single-branch --no-checkout https://github.com/dneto0/spirv-samples.git  C:\spirv-samples\
diff --git a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
index a6a6d84af71ec44fe136396cbb2bdb90ace1ff60..d0fa41edc36f9f53bf6e94949d4431fcd9d357a7 100644
--- a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
@@ -23,6 +23,8 @@
     paths:
       - summary/
       - result.txt
+  variables:
+    D3D12_DEBUG: 0
 
 test-d3d12-quick_gl:
   extends:
diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp b/src/gallium/drivers/d3d12/d3d12_screen.cpp
index 6bc8cd0fb5b7d679a96974e84c62f441d52d87f3..d5d20c57e89ec515179fa8f0c167ac116866fb61 100644
--- a/src/gallium/drivers/d3d12/d3d12_screen.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp
@@ -60,7 +60,13 @@ d3d12_debug_options[] = {
    DEBUG_NAMED_VALUE_END
 };
 
-DEBUG_GET_ONCE_FLAGS_OPTION(d3d12_debug, "D3D12_DEBUG", d3d12_debug_options, 0)
+constexpr unsigned default_debug_options =
+#ifdef DEBUG
+   D3D12_DEBUG_DEBUG_LAYER;
+#else
+   0;
+#endif
+DEBUG_GET_ONCE_FLAGS_OPTION(d3d12_debug, "D3D12_DEBUG", d3d12_debug_options, default_debug_options)
 
 uint32_t
 d3d12_debug;
@@ -894,9 +900,7 @@ d3d12_init_screen(struct d3d12_screen *screen, struct sw_winsys *winsys, IUnknow
    screen->base.flush_frontbuffer = d3d12_flush_frontbuffer;
    screen->base.destroy = d3d12_destroy_screen;
 
-#ifndef DEBUG
    if (d3d12_debug & D3D12_DEBUG_DEBUG_LAYER)
-#endif
       enable_d3d12_debug_layer();
 
    if (d3d12_debug & D3D12_DEBUG_GPU_VALIDATOR)