From e4bd138065b69e8da3a09378679c871665472ce1 Mon Sep 17 00:00:00 2001 From: Cody Northrop Date: Tue, 25 Aug 2015 15:39:48 -0600 Subject: Bug 14474: Remove *_USAGE_GENERAL --- include/vulkan.h | 2 -- layers/param_checker.cpp | 14 ++------------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/include/vulkan.h b/include/vulkan.h index b032bf7f..3b4354da 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -876,7 +876,6 @@ typedef enum { typedef VkFlags VkFormatFeatureFlags; typedef enum { - VK_IMAGE_USAGE_GENERAL = 0, VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT = 0x00000001, VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT = 0x00000002, VK_IMAGE_USAGE_SAMPLED_BIT = 0x00000004, @@ -957,7 +956,6 @@ typedef enum { typedef VkFlags VkQueryResultFlags; typedef enum { - VK_BUFFER_USAGE_GENERAL = 0, VK_BUFFER_USAGE_TRANSFER_SOURCE_BIT = 0x00000001, VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT = 0x00000002, VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT = 0x00000004, diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index fef0f84f..91e1c311 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -506,8 +506,7 @@ bool ValidateEnumerator(VkImageUsageFlagBits const& enumerator) VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT | VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT | - VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT | - VK_IMAGE_USAGE_GENERAL); + VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT); if(enumerator & (~allFlags)) { return false; @@ -557,10 +556,6 @@ std::string EnumeratorString(VkImageUsageFlagBits const& enumerator) { strings.push_back("VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT"); } - if(enumerator & VK_IMAGE_USAGE_GENERAL) - { - strings.push_back("VK_IMAGE_USAGE_GENERAL"); - } std::string enumeratorString; for(auto const& string : strings) @@ -1032,8 +1027,7 @@ bool ValidateEnumerator(VkBufferUsageFlagBits const& enumerator) VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT | VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_SOURCE_BIT | - VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | - VK_BUFFER_USAGE_GENERAL); + VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT); if(enumerator & (~allFlags)) { return false; @@ -1087,10 +1081,6 @@ std::string EnumeratorString(VkBufferUsageFlagBits const& enumerator) { strings.push_back("VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT"); } - if(enumerator & VK_BUFFER_USAGE_GENERAL) - { - strings.push_back("VK_BUFFER_USAGE_GENERAL"); - } std::string enumeratorString; for(auto const& string : strings) -- cgit v1.2.3