commit 3c4cf6fe7d66522dceefac4deff96ad30f730f79
author Courtney Goeltzenleuchter <courtney@LunarG.com> Tue Oct 20 11:32:47 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Oct 23 17:31:14 2015 -0600
tree cf195a69b27e22cdcf22411b52b0a435e1067626
parent e5c31cfbe9e42a5853375177f816a86912067d10

misc: Remove WRITE_COMBINED

icd/intel/intel.h

diff --git a/icd/intel/intel.h b/icd/intel/intel.h
index 37aac3c..e324f24 100644
--- a/icd/intel/intel.h
+++ b/icd/intel/intel.h
@@ -57,8 +57,7 @@
 #define INTEL_MAX_VIEWPORTS 16
 
 #define INTEL_MEMORY_PROPERTY_ALL (VK_MEMORY_PROPERTY_DEVICE_ONLY | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |\
-    VK_MEMORY_PROPERTY_HOST_NON_COHERENT_BIT | VK_MEMORY_PROPERTY_HOST_UNCACHED_BIT |\
-    VK_MEMORY_PROPERTY_HOST_WRITE_COMBINED_BIT)
+    VK_MEMORY_PROPERTY_HOST_NON_COHERENT_BIT | VK_MEMORY_PROPERTY_HOST_UNCACHED_BIT)
 #define INTEL_MEMORY_HEAP_COUNT   1
 #define INTEL_MEMORY_HEAP_SIZE    (2u << 30)
 #define INTEL_MEMORY_TYPE_COUNT   1

include/vulkan.h

diff --git a/include/vulkan.h b/include/vulkan.h
index b11c0a3..d395eb0 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -893,8 +893,7 @@
     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_HOST_WRITE_COMBINED_BIT = 0x00000008,
-    VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT = 0x00000010,
+    VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT = 0x00000008,
 } VkMemoryPropertyFlagBits;
 typedef VkFlags VkMemoryPropertyFlags;
 

layers/param_checker.cpp

diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 1076202..e8b4dce 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -513,7 +513,6 @@
 bool ValidateEnumerator(VkMemoryPropertyFlagBits const& enumerator)
 {
     VkMemoryPropertyFlagBits allFlags = (VkMemoryPropertyFlagBits)(VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT |
-        VK_MEMORY_PROPERTY_HOST_WRITE_COMBINED_BIT |
         VK_MEMORY_PROPERTY_HOST_NON_COHERENT_BIT |
         VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
         VK_MEMORY_PROPERTY_HOST_UNCACHED_BIT |
@@ -539,10 +538,6 @@
     {
         strings.push_back("VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT");
     }
-    if(enumerator & VK_MEMORY_PROPERTY_HOST_WRITE_COMBINED_BIT)
-    {
-        strings.push_back("VK_MEMORY_PROPERTY_HOST_WRITE_COMBINED_BIT");
-    }
     if(enumerator & VK_MEMORY_PROPERTY_HOST_NON_COHERENT_BIT)
     {
         strings.push_back("VK_MEMORY_PROPERTY_HOST_NON_COHERENT_BIT");