From dfc5a8864bdfe193981f0e2849e0fd9bcccd7587 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Tue, 20 Oct 2015 11:32:47 -0600 Subject: misc: Remove WRITE_COMBINED --- include/vulkan.h | 3 +-- layers/param_checker.cpp | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/include/vulkan.h b/include/vulkan.h index b11c0a3f..d395eb07 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -893,8 +893,7 @@ typedef enum { 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; diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 10762027..e8b4dcea 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -513,7 +513,6 @@ static 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 @@ std::string EnumeratorString(VkMemoryPropertyFlagBits const& enumerator) { 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"); -- cgit v1.2.3