From ddf4e7edfcf382fec8d64597ddcd6c8e494c1ff8 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Mon, 26 Oct 2015 17:18:26 +0800 Subject: bug 14778: VK_IMAGE_VIEW_CREATE_READ_ONLY_DEPTH_BIT underspecified (WIP) https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14778 --- include/vulkan.h | 5 ----- layers/param_checker.cpp | 45 --------------------------------------------- 2 files changed, 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 @@ -1070,51 +1070,6 @@ std::string EnumeratorString(VkImageCreateFlagBits const& enumerator) return enumeratorString; } -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 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) { -- cgit v1.2.3