From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 7 Jul 2015 00:32:28 +0000 (-0700)
Subject: vk/vulkan.h: Replace DEVICE_COHERENT_BIT with DEVICE_NON_COHERENT_BIT
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=68fa750f2e1c94be6021d39b744cb0a2f37dcd5f;p=mesa.git

vk/vulkan.h: Replace DEVICE_COHERENT_BIT with DEVICE_NON_COHERENT_BIT
---

diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 70ce0e4c3bd..7f6776ebbeb 100644
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -905,7 +905,7 @@ typedef VkFlags VkQueueFlags;
 typedef enum {
     VK_MEMORY_PROPERTY_DEVICE_ONLY = 0,
     VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT = 0x00000001,
-    VK_MEMORY_PROPERTY_HOST_DEVICE_COHERENT_BIT = 0x00000002,
+    VK_MEMORY_PROPERTY_HOST_NON_COHERENT_BIT = 0x00000002,
     VK_MEMORY_PROPERTY_HOST_UNCACHED_BIT = 0x00000004,
     VK_MEMORY_PROPERTY_HOST_WRITE_COMBINED_BIT = 0x00000008,
     VK_MEMORY_PROPERTY_PREFER_HOST_LOCAL = 0x00000010,
diff --git a/src/vulkan/device.c b/src/vulkan/device.c
index c833d24a997..088a3f6bb81 100644
--- a/src/vulkan/device.c
+++ b/src/vulkan/device.c
@@ -1089,7 +1089,7 @@ fill_memory_requirements(
 
    memory_requirements->memPropsAllowed =
       VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
-      VK_MEMORY_PROPERTY_HOST_DEVICE_COHERENT_BIT |
+      /* VK_MEMORY_PROPERTY_HOST_NON_COHERENT_BIT | */
       /* VK_MEMORY_PROPERTY_HOST_UNCACHED_BIT | */
       VK_MEMORY_PROPERTY_HOST_WRITE_COMBINED_BIT |
       VK_MEMORY_PROPERTY_PREFER_HOST_LOCAL;