aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCourtney Goeltzenleuchter <courtney@LunarG.com>2015-10-20 11:32:47 -0600
committerCourtney Goeltzenleuchter <courtney@LunarG.com>2015-10-23 17:31:14 -0600
commitdfc5a8864bdfe193981f0e2849e0fd9bcccd7587 (patch)
treed6d4199714dff987c42d169db280450f86ce5354
parent8a3d7e4e6fc0e40330d41d49ecdefbda7a7a2314 (diff)
downloadusermoji-dfc5a8864bdfe193981f0e2849e0fd9bcccd7587.tar.xz
misc: Remove WRITE_COMBINED
-rw-r--r--include/vulkan.h3
-rw-r--r--layers/param_checker.cpp5
2 files changed, 1 insertions, 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");