From 596910dd986299efe4c226127e77c8ee23f9f785 Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Mon, 9 Jun 2025 16:30:59 +0200
Subject: [PATCH] ci/vkd3d: Disable Werror for vkd3d-proton

These warnings were causing the arm64 build to fail:

../../vkd3d-proton-src/libs/vkd3d/command.c: In function 'd3d12_shared_fence_set_native_sync_handle_on_completion_explicit':
../../vkd3d-proton-src/libs/vkd3d/command.c:1772:27: error: assignment to 'const uint64_t *' {aka 'const long unsigned int *'} from incompatible pointer type 'UINT64 *' {aka 'long long unsigned int *'} [-Wincompatible-pointer-types]
 1772 |         wait_info.pValues = &value;
      |                           ^

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35853>
---
 .gitlab-ci/conditional-build-image-tags.yml |  2 +-
 .gitlab-ci/container/build-vkd3d-proton.sh  | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml
index c4600994e20..d237c84b1b9 100644
--- a/.gitlab-ci/conditional-build-image-tags.yml
+++ b/.gitlab-ci/conditional-build-image-tags.yml
@@ -4,4 +4,4 @@ variables:
   CONDITIONAL_BUILD_CROSVM_TAG: 4079babd375b09761d59eacb25a0598a
   CONDITIONAL_BUILD_FLUSTER_TAG: 7c6f5e2af781cd4e39358500c1549541
   CONDITIONAL_BUILD_PIGLIT_TAG: ba6cc303aa3ffe5eb580af101693266c
-  CONDITIONAL_BUILD_VKD3D_PROTON_TAG: a1ec19b34712ffc19b496abc6e3cbcc8
+  CONDITIONAL_BUILD_VKD3D_PROTON_TAG: 1c4dc78fc625134a2fc0a352cc6368b0
diff --git a/.gitlab-ci/container/build-vkd3d-proton.sh b/.gitlab-ci/container/build-vkd3d-proton.sh
index 4bea5d9e4a7..af68cf2e696 100644
--- a/.gitlab-ci/container/build-vkd3d-proton.sh
+++ b/.gitlab-ci/container/build-vkd3d-proton.sh
@@ -30,12 +30,13 @@ git checkout "$VKD3D_PROTON_COMMIT"
 git submodule update --init --recursive
 git submodule update --recursive
 
-meson setup                              \
-      -D enable_tests=true               \
-      --buildtype release                \
-      --prefix "$VKD3D_PROTON_DST_DIR"   \
-      --strip                            \
-      --libdir "lib"                     \
+meson setup                                           \
+      -D c_args=-Wno-error=incompatible-pointer-types \
+      -D enable_tests=true                            \
+      --buildtype release                             \
+      --prefix "$VKD3D_PROTON_DST_DIR"                \
+      --strip                                         \
+      --libdir "lib"                                  \
       "$VKD3D_PROTON_BUILD_DIR/build"
 
 ninja -C "$VKD3D_PROTON_BUILD_DIR/build" install