vk: Add initial support for VK_WSI_swapchain

diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am
index a2a9c430869521fc08a34ec2fc1224a02b06cf9b..9d52dad7bb12bd538ae062062db06cbbbe1cdffa 100644 (file)
--- 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 25fedf908b8ff9562eab2b27591734c8604adc61..e83bd4bf2722c96bd143591c263cd5f7783b95d8 100644 (file)
--- 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 ca62dc487d73ef59b1bee957b9cae602024c17c0..c09d4ad2f0d2b995bfdf406c92f0b3d3f0e1e102 100644 (file)
--- 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 (file)
index 0000000..5ae9b85
--- /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;
+}