From 3d9fbb6575697744642c28464fb098552576ac97 Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 1 Sep 2015 17:00:10 -0700
Subject: [PATCH] vk: Add initial support for VK_WSI_swapchain

---
 src/vulkan/Makefile.am   |  2 ++
 src/vulkan/anv_device.c  |  4 ++++
 src/vulkan/anv_private.h |  1 +
 src/vulkan/anv_wsi.c     | 41 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 src/vulkan/anv_wsi.c

diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am
index a2a9c430869..9d52dad7bb1 100644
--- a/src/vulkan/Makefile.am
+++ b/src/vulkan/Makefile.am
@@ -27,6 +27,7 @@ vulkan_include_HEADERS =				\
 	$(top_srcdir)/include/vulkan/vk_platform.h	\
 	$(top_srcdir)/include/vulkan/vulkan.h		\
 	$(top_srcdir)/include/vulkan/vulkan_intel.h	\
+	$(top_srcdir)/include/vulkan/vk_wsi_swapchain.h	\
 	$(top_srcdir)/include/vulkan/vk_wsi_lunarg.h
 
 lib_LTLIBRARIES = libvulkan.la
@@ -72,6 +73,7 @@ VULKAN_SOURCES =                                        \
 	anv_private.h                                   \
 	anv_query.c                                     \
 	anv_util.c                                      \
+	anv_wsi.c					\
 	anv_wsi_x11.c					\
 	gen8_state.c					\
 	gen8_cmd_buffer.c				\
diff --git a/src/vulkan/anv_device.c b/src/vulkan/anv_device.c
index 25fedf908b8..e83bd4bf272 100644
--- a/src/vulkan/anv_device.c
+++ b/src/vulkan/anv_device.c
@@ -633,6 +633,10 @@ VkResult anv_DestroyDevice(
 }
 
 static const VkExtensionProperties global_extensions[] = {
+   {
+      .extName = "VK_WSI_swapchain",
+      .specVersion = 12
+   },
    {
       .extName = "VK_WSI_LunarG",
       .specVersion = 3
diff --git a/src/vulkan/anv_private.h b/src/vulkan/anv_private.h
index ca62dc487d7..c09d4ad2f0d 100644
--- a/src/vulkan/anv_private.h
+++ b/src/vulkan/anv_private.h
@@ -47,6 +47,7 @@
 #include <vulkan/vulkan.h>
 #include <vulkan/vulkan_intel.h>
 #include <vulkan/vk_wsi_lunarg.h>
+#include <vulkan/vk_wsi_swapchain.h>
 
 #include "anv_entrypoints.h"
 
diff --git a/src/vulkan/anv_wsi.c b/src/vulkan/anv_wsi.c
new file mode 100644
index 00000000000..5ae9b85e540
--- /dev/null
+++ b/src/vulkan/anv_wsi.c
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2015 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "anv_private.h"
+
+VkResult
+anv_GetPhysicalDeviceSurfaceSupportWSI(
+    VkPhysicalDevice                        physicalDevice,
+    uint32_t                                queueFamilyIndex,
+    const VkSurfaceDescriptionWSI*          pSurfaceDescription,
+    VkBool32*                               pSupported)
+{
+   assert(pSurfaceDescription->sType ==
+          VK_STRUCTURE_TYPE_SURFACE_DESCRIPTION_WINDOW_WSI);
+
+   VkSurfaceDescriptionWindowWSI *window = (void *)pSurfaceDescription;
+
+   *pSupported = window->platform == VK_PLATFORM_XCB_WSI;
+
+   return VK_SUCCESS;
+}
-- 
2.30.2