d3d12: Update and require DirectX-Headers 1.610.0

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22454>

9 files changed, 11 insertions, 11 deletions

diff --git a/.gitlab-ci/container/debian/x86_build.sh b/.gitlab-ci/container/debian/x86_build.sh
index cc39d3e1a61..d1113ec3c62 100644
--- a/.gitlab-ci/container/debian/x86_build.sh
+++ b/.gitlab-ci/container/debian/x86_build.sh
@@ -83,7 +83,7 @@ cd shader-db
 make
 popd
 
-git clone https://github.com/microsoft/DirectX-Headers -b v1.606.4 --depth 1
+git clone https://github.com/microsoft/DirectX-Headers -b v1.610.0 --depth 1
 mkdir -p DirectX-Headers/build
 pushd DirectX-Headers/build
 meson .. --backend=ninja --buildtype=release -Dbuild-test=false
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 7845dc591df..b36432314a3 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -3,7 +3,7 @@ variables:
    DEBIAN_BASE_TAG: "2023-03-27-virglrenderer-crosvm"
 
    DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
-   DEBIAN_BUILD_TAG: "2023-04-03-android-meson-aarch64"
+   DEBIAN_BUILD_TAG: "2023-04-13-agility-610"
 
    DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw"
    DEBIAN_BUILD_MINGW_TAG: "2023-01-03-ci-libva-2.17"
@@ -27,7 +27,7 @@ variables:
    WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"
 
    WINDOWS_X64_BUILD_PATH: "windows/x64_build"
-   WINDOWS_X64_BUILD_TAG: "2023-04-05-agility-710"
+   WINDOWS_X64_BUILD_TAG: "2023-04-13-agility-610"
 
    WINDOWS_X64_TEST_PATH: "windows/x64_test"
-   WINDOWS_X64_TEST_TAG: "2023-04-05-agility-710"
+   WINDOWS_X64_TEST_TAG: "2023-04-13-agility-610"
diff --git a/.gitlab-ci/windows/mesa_deps_build.ps1 b/.gitlab-ci/windows/mesa_deps_build.ps1
index a863e34eaa9..0f97a92ec18 100644
--- a/.gitlab-ci/windows/mesa_deps_build.ps1
+++ b/.gitlab-ci/windows/mesa_deps_build.ps1
@@ -12,7 +12,7 @@ $depsInstallPath="C:\mesa-deps"
 
 Get-Date
 Write-Host "Cloning DirectX-Headers"
-git clone -b v1.710.0-preview --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
+git clone -b v1.610.0 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
 if (!$?) {
   Write-Host "Failed to clone DirectX-Headers repository"
   Exit 1
diff --git a/.gitlab-ci/windows/mesa_deps_test.ps1 b/.gitlab-ci/windows/mesa_deps_test.ps1
index 9aaf10e373f..6f8d2f4266f 100644
--- a/.gitlab-ci/windows/mesa_deps_test.ps1
+++ b/.gitlab-ci/windows/mesa_deps_test.ps1
@@ -132,7 +132,7 @@ cargo install --git https://gitlab.freedesktop.org/anholt/deqp-runner.git
 
 Get-Date
 Write-Host "Downloading DirectX 12 Agility SDK"
-Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.710.0-preview -OutFile 'agility.zip'
+Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.610.0 -OutFile 'agility.zip'
 Expand-Archive -Path 'agility.zip' -DestinationPath 'C:\agility'
 Remove-Item 'agility.zip'
 
diff --git a/meson.build b/meson.build
index a09ad156dd2..23d2d965b37 100644
--- a/meson.build
+++ b/meson.build
@@ -502,7 +502,7 @@ if with_gallium_d3d12 or with_microsoft_clc or with_microsoft_vk
   dep_dxheaders = dependency('directx-headers', required : false)
   if not dep_dxheaders.found()
     dep_dxheaders = dependency('DirectX-Headers',
-      version : '>= 1.606.4',
+      version : '>= 1.610.0',
       fallback : ['DirectX-Headers', 'dep_dxheaders'],
       required : with_gallium_d3d12 or with_microsoft_vk
     )
diff --git a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
index 20e7ecd5eed..b022ded6bde 100644
--- a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
@@ -14,7 +14,7 @@
     GALLIUM_DRIVER: d3d12
     WGL_DISABLE_ERROR_DIALOGS: "true"
     D3D12_AGILITY_RELATIVE_PATH: "D3D12\\"
-    D3D12_AGILITY_SDK_VERSION: 710
+    D3D12_AGILITY_SDK_VERSION: 610
 
 .d3d12-test-piglit:
   extends:
diff --git a/src/microsoft/ci/gitlab-ci.yml b/src/microsoft/ci/gitlab-ci.yml
index 6b0886a19eb..e93bc7ba84f 100644
--- a/src/microsoft/ci/gitlab-ci.yml
+++ b/src/microsoft/ci/gitlab-ci.yml
@@ -33,7 +33,7 @@ test-dozen-deqp:
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
     DZN_AGILITY_RELATIVE_PATH: "D3D12\\"
-    DZN_AGILITY_SDK_VERSION: 710
+    DZN_AGILITY_SDK_VERSION: 610
   script:
     - . _install/deqp_runner_run.ps1
   artifacts:
diff --git a/src/microsoft/vulkan/dzn_private.h b/src/microsoft/vulkan/dzn_private.h
index c2f793478b7..b01af18f73c 100644
--- a/src/microsoft/vulkan/dzn_private.h
+++ b/src/microsoft/vulkan/dzn_private.h
@@ -1069,7 +1069,7 @@ struct dzn_image {
    struct dzn_device_memory *mem;
    VkDeviceSize mem_offset;
    uint32_t castable_format_count;
-   DXGI_FORMAT *castable_formats;
+   const DXGI_FORMAT *castable_formats;
 
    D3D12_BARRIER_ACCESS valid_access;
 };
diff --git a/subprojects/DirectX-Headers.wrap b/subprojects/DirectX-Headers.wrap
index 40012e87d71..f274eaff991 100644
--- a/subprojects/DirectX-Headers.wrap
+++ b/subprojects/DirectX-Headers.wrap
@@ -2,4 +2,4 @@
 directory = DirectX-Headers-1.0
 
 url = https://github.com/microsoft/DirectX-Headers.git
-revision = v1.606.4
+revision = v1.610.0