From c42afd7ead968e587f544a0deff7e3ff963a4208 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Tue, 27 Oct 2015 18:53:22 +0800
Subject: [PATCH] bug 14922: Consistent memory properties (WIP)

https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14922
---
 demos/cube.c             |  2 +-
 demos/tri.c              |  2 +-
 include/vulkan.h         | 12 ++++++------
 layers/param_checker.cpp | 24 ++++++++++++------------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/demos/cube.c b/demos/cube.c
index 33583bb..ed5fd3a 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -1135,7 +1135,7 @@ static void demo_prepare_textures(struct demo *demo)
             demo_prepare_texture_image(demo, tex_files[i], &demo->textures[i],
                                        VK_IMAGE_TILING_OPTIMAL,
                                        (VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT),
-                                       VK_MEMORY_PROPERTY_DEVICE_ONLY);
+                                       VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
 
             demo_set_image_layout(demo, staging_texture.image,
                                    VK_IMAGE_ASPECT_COLOR_BIT,
diff --git a/demos/tri.c b/demos/tri.c
index a5159a2..2dbfeaf 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -894,7 +894,7 @@ static void demo_prepare_textures(struct demo *demo)
             demo_prepare_texture_image(demo, tex_colors[i], &demo->textures[i],
                                        VK_IMAGE_TILING_OPTIMAL,
                                        (VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT),
-                                       VK_MEMORY_PROPERTY_DEVICE_ONLY);
+                                       VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
 
             demo_set_image_layout(demo, staging_texture.image,
                                    VK_IMAGE_ASPECT_COLOR_BIT,
diff --git a/include/vulkan.h b/include/vulkan.h
index 24aaafa..0768da4 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -810,16 +810,16 @@ typedef enum {
 typedef VkFlags VkQueueFlags;
 
 typedef enum {
-    VK_MEMORY_PROPERTY_DEVICE_ONLY = 0,
-    VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT = 0x00000001,
-    VK_MEMORY_PROPERTY_HOST_NON_COHERENT_BIT = 0x00000002,
-    VK_MEMORY_PROPERTY_HOST_UNCACHED_BIT = 0x00000004,
-    VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT = 0x00000008,
+    VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT = 0x00000001,
+    VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT = 0x00000002,
+    VK_MEMORY_PROPERTY_HOST_COHERENT_BIT = 0x00000004,
+    VK_MEMORY_PROPERTY_HOST_CACHED_BIT = 0x00000008,
+    VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT = 0x00000010,
 } VkMemoryPropertyFlagBits;
 typedef VkFlags VkMemoryPropertyFlags;
 
 typedef enum {
-    VK_MEMORY_HEAP_HOST_LOCAL_BIT = 0x00000001,
+    VK_MEMORY_HEAP_DEVICE_LOCAL_BIT = 0x00000001,
 } VkMemoryHeapFlagBits;
 typedef VkFlags VkMemoryHeapFlags;
 typedef VkFlags VkDeviceCreateFlags;
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 5a65741..736128d 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -504,10 +504,10 @@ static
 bool ValidateEnumerator(VkMemoryPropertyFlagBits const& enumerator)
 {
     VkMemoryPropertyFlagBits allFlags = (VkMemoryPropertyFlagBits)(VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT |
-        VK_MEMORY_PROPERTY_HOST_NON_COHERENT_BIT |
+        VK_MEMORY_PROPERTY_HOST_COHERENT_BIT |
         VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
-        VK_MEMORY_PROPERTY_HOST_UNCACHED_BIT |
-        VK_MEMORY_PROPERTY_DEVICE_ONLY);
+        VK_MEMORY_PROPERTY_HOST_CACHED_BIT |
+        VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
     if(enumerator & (~allFlags))
     {
         return false;
@@ -529,21 +529,21 @@ std::string EnumeratorString(VkMemoryPropertyFlagBits const& enumerator)
     {
         strings.push_back("VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT");
     }
-    if(enumerator & VK_MEMORY_PROPERTY_HOST_NON_COHERENT_BIT)
+    if(enumerator & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)
     {
-        strings.push_back("VK_MEMORY_PROPERTY_HOST_NON_COHERENT_BIT");
+        strings.push_back("VK_MEMORY_PROPERTY_HOST_COHERENT_BIT");
     }
     if(enumerator & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)
     {
         strings.push_back("VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT");
     }
-    if(enumerator & VK_MEMORY_PROPERTY_HOST_UNCACHED_BIT)
+    if(enumerator & VK_MEMORY_PROPERTY_HOST_CACHED_BIT)
     {
-        strings.push_back("VK_MEMORY_PROPERTY_HOST_UNCACHED_BIT");
+        strings.push_back("VK_MEMORY_PROPERTY_HOST_CACHED_BIT");
     }
-    if(enumerator & VK_MEMORY_PROPERTY_DEVICE_ONLY)
+    if(enumerator & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT)
     {
-        strings.push_back("VK_MEMORY_PROPERTY_DEVICE_ONLY");
+        strings.push_back("VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT");
     }
 
     std::string enumeratorString;
@@ -563,7 +563,7 @@ std::string EnumeratorString(VkMemoryPropertyFlagBits const& enumerator)
 static
 bool ValidateEnumerator(VkMemoryHeapFlagBits const& enumerator)
 {
-    VkMemoryHeapFlagBits allFlags = (VkMemoryHeapFlagBits)(VK_MEMORY_HEAP_HOST_LOCAL_BIT);
+    VkMemoryHeapFlagBits allFlags = (VkMemoryHeapFlagBits)(VK_MEMORY_HEAP_DEVICE_LOCAL_BIT);
     if(enumerator & (~allFlags))
     {
         return false;
@@ -581,9 +581,9 @@ std::string EnumeratorString(VkMemoryHeapFlagBits const& enumerator)
     }
 
     std::vector<std::string> strings;
-    if(enumerator & VK_MEMORY_HEAP_HOST_LOCAL_BIT)
+    if(enumerator & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT)
     {
-        strings.push_back("VK_MEMORY_HEAP_HOST_LOCAL_BIT");
+        strings.push_back("VK_MEMORY_HEAP_DEVICE_LOCAL_BIT");
     }
 
     std::string enumeratorString;
-- 
2.7.4