From 2de388c49cfb3786936ce9ca1f2e479aa82fd26b Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Mon, 6 Jul 2015 17:12:47 -0700
Subject: [PATCH] vk: Remove SHAREABLE bits

They were removed from the Vulkan API and we don't really use them because
there are no multi-GPU i965 systems.
---
 include/vulkan/vulkan.h | 15 ++++-----------
 src/vulkan/device.c     |  3 +--
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 5f0906f932e..cdd60288fe1 100644
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -911,7 +911,6 @@ typedef enum {
     VK_MEMORY_PROPERTY_HOST_UNCACHED_BIT = 0x00000004,
     VK_MEMORY_PROPERTY_HOST_WRITE_COMBINED_BIT = 0x00000008,
     VK_MEMORY_PROPERTY_PREFER_HOST_LOCAL = 0x00000010,
-    VK_MEMORY_PROPERTY_SHAREABLE_BIT = 0x00000011,
 } VkMemoryPropertyFlagBits;
 typedef VkFlags VkMemoryPropertyFlags;
 
@@ -926,10 +925,6 @@ typedef enum {
     VK_FENCE_CREATE_SIGNALED_BIT = 0x00000001,
 } VkFenceCreateFlagBits;
 typedef VkFlags VkFenceCreateFlags;
-
-typedef enum {
-    VK_SEMAPHORE_CREATE_SHAREABLE_BIT = 0x00000001,
-} VkSemaphoreCreateFlagBits;
 typedef VkFlags VkSemaphoreCreateFlags;
 typedef VkFlags VkEventCreateFlags;
 
@@ -973,8 +968,7 @@ typedef enum {
 typedef VkFlags VkBufferUsageFlags;
 
 typedef enum {
-    VK_BUFFER_CREATE_SHAREABLE_BIT = 0x00000001,
-    VK_BUFFER_CREATE_SPARSE_BIT = 0x00000002,
+    VK_BUFFER_CREATE_SPARSE_BIT = 0x00000001,
 } VkBufferCreateFlagBits;
 typedef VkFlags VkBufferCreateFlags;
 
@@ -993,10 +987,9 @@ typedef VkFlags VkImageUsageFlags;
 typedef enum {
     VK_IMAGE_CREATE_INVARIANT_DATA_BIT = 0x00000001,
     VK_IMAGE_CREATE_CLONEABLE_BIT = 0x00000002,
-    VK_IMAGE_CREATE_SHAREABLE_BIT = 0x00000004,
-    VK_IMAGE_CREATE_SPARSE_BIT = 0x00000008,
-    VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT = 0x00000010,
-    VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT = 0x00000020,
+    VK_IMAGE_CREATE_SPARSE_BIT = 0x00000004,
+    VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT = 0x00000008,
+    VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT = 0x00000010,
 } VkImageCreateFlagBits;
 typedef VkFlags VkImageCreateFlags;
 
diff --git a/src/vulkan/device.c b/src/vulkan/device.c
index 35eaad21774..35f3f31e67b 100644
--- a/src/vulkan/device.c
+++ b/src/vulkan/device.c
@@ -1092,8 +1092,7 @@ fill_memory_requirements(
       VK_MEMORY_PROPERTY_HOST_DEVICE_COHERENT_BIT |
       /* VK_MEMORY_PROPERTY_HOST_UNCACHED_BIT | */
       VK_MEMORY_PROPERTY_HOST_WRITE_COMBINED_BIT |
-      VK_MEMORY_PROPERTY_PREFER_HOST_LOCAL |
-      VK_MEMORY_PROPERTY_SHAREABLE_BIT;
+      VK_MEMORY_PROPERTY_PREFER_HOST_LOCAL;
 
    memory_requirements->memPropsRequired = 0;
 
-- 
2.30.2