Mesa (staging/21.1): vulkan: fix duplicate win32 def

[GitLab Mirror]

Module: Mesa
Branch: staging/21.1
Commit: 62e4fe2300fc92514d13df9281045e8bdbe8377d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=62e4fe2300fc92514d13df9281045e8bdbe8377d

Author: Michel Zou <xantares09 at hotmail.com>
Date:   Thu Apr 15 22:38:24 2021 +0200

vulkan: fix duplicate win32 def

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
(cherry picked from commit dc036b17695318cd9c7f8e3376c017e896c2d1b1)

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

---

 .pick_status.json      | 2 +-
 src/vulkan/meson.build | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 3d25812c1cc..01123a6218d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -6718,7 +6718,7 @@
         "description": "vulkan: fix duplicate win32 def",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/vulkan/meson.build b/src/vulkan/meson.build
index 3a6806cb5e1..3f95551f296 100644
--- a/src/vulkan/meson.build
+++ b/src/vulkan/meson.build
@@ -59,9 +59,6 @@ if with_xlib_lease
   vulkan_wsi_deps += [dep_xlib_xrandr]
   vulkan_wsi_list += ['xlib_xrandr']
 endif
-if with_platform_windows
-  vulkan_wsi_args += ['-DVK_USE_PLATFORM_WIN32_KHR']
-endif
 
 
 subdir('util')