diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-09-10 16:25:49 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-09-11 09:20:02 -0600 |
| commit | 41eb54959fd8b3fa8580312221433c1a1ba919f2 (patch) | |
| tree | d57d0cddf11ce12bf532ca8d4219c4b5502066dd | |
| parent | 4e368eec5a90de72c014e451712d6530a844dff7 (diff) | |
| download | usermoji-41eb54959fd8b3fa8580312221433c1a1ba919f2.tar.xz | |
Bug 14313: Remove VK_FORMAT_FEATURE_CONVERSION_BIT
| -rw-r--r-- | demos/vulkaninfo.c | 3 | ||||
| -rw-r--r-- | include/vulkan.h | 5 | ||||
| -rw-r--r-- | layers/param_checker.cpp | 6 |
3 files changed, 4 insertions, 10 deletions
diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c index 0e273437..e3586627 100644 --- a/demos/vulkaninfo.c +++ b/demos/vulkaninfo.c @@ -716,14 +716,13 @@ static void app_dev_dump_format_props(const struct app_dev *dev, VkFormat fmt) if (features[i].flags == 0) { printf("\n\t\tNone"); } else { - printf("%s%s%s%s%s%s%s%s%s%s%s%s%s", + printf("%s%s%s%s%s%s%s%s%s%s%s%s", ((features[i].flags & VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT) ? "\n\t\tVK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT" : ""), ((features[i].flags & VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT) ? "\n\t\tVK_FORMAT_FEATURE_STORAGE_IMAGE_BIT" : ""), ((features[i].flags & VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT) ? "\n\t\tVK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT" : ""), ((features[i].flags & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT) ? "\n\t\tVK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT" : ""), ((features[i].flags & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT) ? "\n\t\tVK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT" : ""), ((features[i].flags & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT) ? "\n\t\tVK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT" : ""), - ((features[i].flags & VK_FORMAT_FEATURE_CONVERSION_BIT) ? "\n\t\tVK_FORMAT_FEATURE_CONVERSION_BIT" : ""), ((features[i].flags & VK_FORMAT_FEATURE_BLIT_SOURCE_BIT) ? "\n\t\tVK_FORMAT_FEATURE_BLIT_SOURCE_BIT" : ""), ((features[i].flags & VK_FORMAT_FEATURE_BLIT_DESTINATION_BIT) ? "\n\t\tVK_FORMAT_FEATURE_BLIT_DESTINATION_BIT" : ""), ((features[i].flags & VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT) ? "\n\t\tVK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT" : ""), diff --git a/include/vulkan.h b/include/vulkan.h index e034f6b0..8218a67f 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -846,9 +846,8 @@ typedef enum { VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT = 0x00000080, VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT = 0x00000100, VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT = 0x00000200, - VK_FORMAT_FEATURE_CONVERSION_BIT = 0x00000400, - VK_FORMAT_FEATURE_BLIT_SOURCE_BIT = 0x00000800, - VK_FORMAT_FEATURE_BLIT_DESTINATION_BIT = 0x00001000, + VK_FORMAT_FEATURE_BLIT_SOURCE_BIT = 0x00000400, + VK_FORMAT_FEATURE_BLIT_DESTINATION_BIT = 0x00000800, } VkFormatFeatureFlagBits; typedef VkFlags VkFormatFeatureFlags; diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 338401d2..862dd2d4 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -295,7 +295,7 @@ std::string EnumeratorString(VkResult const& enumerator) static bool ValidateEnumerator(VkFormatFeatureFlagBits const& enumerator) { - VkFormatFeatureFlagBits allFlags = (VkFormatFeatureFlagBits)(VK_FORMAT_FEATURE_CONVERSION_BIT | + VkFormatFeatureFlagBits allFlags = (VkFormatFeatureFlagBits)( VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT | VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT | @@ -325,10 +325,6 @@ std::string EnumeratorString(VkFormatFeatureFlagBits const& enumerator) } std::vector<std::string> strings; - if(enumerator & VK_FORMAT_FEATURE_CONVERSION_BIT) - { - strings.push_back("VK_FORMAT_FEATURE_CONVERSION_BIT"); - } if(enumerator & VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT) { strings.push_back("VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT"); |