diff options
| author | Chia-I Wu <olv@lunarg.com> | 2015-10-26 17:18:26 +0800 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-11-02 14:12:20 -0700 |
| commit | ddf4e7edfcf382fec8d64597ddcd6c8e494c1ff8 (patch) | |
| tree | 788168dda98b1dcbb45f39f9a7a1cd74ebf20f6c | |
| parent | 79fd254774736a45c50817612c0c51779b5fe26a (diff) | |
| download | usermoji-ddf4e7edfcf382fec8d64597ddcd6c8e494c1ff8.tar.xz | |
bug 14778: VK_IMAGE_VIEW_CREATE_READ_ONLY_DEPTH_BIT underspecified (WIP)
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14778
| -rw-r--r-- | include/vulkan.h | 5 | ||||
| -rw-r--r-- | layers/param_checker.cpp | 45 |
2 files changed, 0 insertions, 50 deletions
diff --git a/include/vulkan.h b/include/vulkan.h index d4de88bd..03db3cc9 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -910,11 +910,6 @@ typedef enum { } VkBufferUsageFlagBits; typedef VkFlags VkBufferUsageFlags; typedef VkFlags VkBufferViewCreateFlags; - -typedef enum { - VK_IMAGE_VIEW_CREATE_READ_ONLY_DEPTH_BIT = 0x00000001, - VK_IMAGE_VIEW_CREATE_READ_ONLY_STENCIL_BIT = 0x00000002, -} VkImageViewCreateFlagBits; typedef VkFlags VkImageViewCreateFlags; typedef VkFlags VkImageAspectFlags; typedef VkFlags VkShaderModuleCreateFlags; diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 7dbc0812..fa8b5e38 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -1071,51 +1071,6 @@ std::string EnumeratorString(VkImageCreateFlagBits const& enumerator) } static -bool ValidateEnumerator(VkImageViewCreateFlagBits const& enumerator) -{ - VkImageViewCreateFlagBits allFlags = (VkImageViewCreateFlagBits)(VK_IMAGE_VIEW_CREATE_READ_ONLY_DEPTH_BIT | - VK_IMAGE_VIEW_CREATE_READ_ONLY_STENCIL_BIT); - if(enumerator & (~allFlags)) - { - return false; - } - - return true; -} - -static -std::string EnumeratorString(VkImageViewCreateFlagBits const& enumerator) -{ - if(!ValidateEnumerator(enumerator)) - { - return "unrecognized enumerator"; - } - - std::vector<std::string> strings; - if(enumerator & VK_IMAGE_VIEW_CREATE_READ_ONLY_DEPTH_BIT) - { - strings.push_back("VK_IMAGE_VIEW_CREATE_READ_ONLY_DEPTH_BIT"); - } - if(enumerator & VK_IMAGE_VIEW_CREATE_READ_ONLY_STENCIL_BIT) - { - strings.push_back("VK_IMAGE_VIEW_CREATE_READ_ONLY_STENCIL_BIT"); - } - - std::string enumeratorString; - for(auto const& string : strings) - { - enumeratorString += string; - - if(string != strings.back()) - { - enumeratorString += '|'; - } - } - - return enumeratorString; -} - -static bool ValidateEnumerator(VkChannelFlagBits const& enumerator) { VkChannelFlagBits allFlags = (VkChannelFlagBits)(VK_CHANNEL_A_BIT | |
