diff options
| author | Chia-I Wu <olv@lunarg.com> | 2015-10-27 18:53:22 +0800 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-11-02 14:57:10 -0700 |
| commit | c42afd7ead968e587f544a0deff7e3ff963a4208 (patch) | |
| tree | e63d0e8b7f5f58dc62e9cb97108af3c1c5ac7343 /layers/param_checker.cpp | |
| parent | 84f93960d3369925eba0eae34198ecbfc63adada (diff) | |
| download | usermoji-c42afd7ead968e587f544a0deff7e3ff963a4208.tar.xz | |
bug 14922: Consistent memory properties (WIP)
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14922
Diffstat (limited to 'layers/param_checker.cpp')
| -rw-r--r-- | layers/param_checker.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 5a65741a..736128db 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; |