diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-09-14 16:36:13 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-09-15 10:16:02 -0600 |
| commit | 9f7f3666d6a94fe60b673d480d45e5e9a1013075 (patch) | |
| tree | c54371b99ad011d0837851617226fbbcb909f9c8 | |
| parent | 9441534f6b0bb89fd8d0fca73e4d1f51eb6c2c38 (diff) | |
| download | usermoji-9f7f3666d6a94fe60b673d480d45e5e9a1013075.tar.xz | |
bug-14583: Remove the unneeded vkBufferViewType
No longer have viewType to distinguish the type, so pull
it internal and use for descriptor sets.
| -rw-r--r-- | include/vulkan.h | 10 | ||||
| -rw-r--r-- | layers/param_checker.cpp | 7 |
2 files changed, 0 insertions, 17 deletions
diff --git a/include/vulkan.h b/include/vulkan.h index f5fe0bfa..d865ded5 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -479,15 +479,6 @@ typedef enum { } VkSharingMode; typedef enum { - VK_BUFFER_VIEW_TYPE_RAW = 0, - VK_BUFFER_VIEW_TYPE_FORMATTED = 1, - VK_BUFFER_VIEW_TYPE_BEGIN_RANGE = VK_BUFFER_VIEW_TYPE_RAW, - VK_BUFFER_VIEW_TYPE_END_RANGE = VK_BUFFER_VIEW_TYPE_FORMATTED, - VK_BUFFER_VIEW_TYPE_NUM = (VK_BUFFER_VIEW_TYPE_FORMATTED - VK_BUFFER_VIEW_TYPE_RAW + 1), - VK_BUFFER_VIEW_TYPE_MAX_ENUM = 0x7FFFFFFF -} VkBufferViewType; - -typedef enum { VK_IMAGE_VIEW_TYPE_1D = 0, VK_IMAGE_VIEW_TYPE_2D = 1, VK_IMAGE_VIEW_TYPE_3D = 2, @@ -1483,7 +1474,6 @@ typedef struct { VkStructureType sType; const void* pNext; VkBuffer buffer; - VkBufferViewType viewType; VkFormat format; VkDeviceSize offset; VkDeviceSize range; diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 6458d164..40712077 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -3615,13 +3615,6 @@ bool PreCreateBufferView( "vkCreateBufferView parameter, VkStructureType pCreateInfo->sType, is an invalid enumerator"); return false; } - if(pCreateInfo->viewType < VK_BUFFER_VIEW_TYPE_BEGIN_RANGE || - pCreateInfo->viewType > VK_BUFFER_VIEW_TYPE_END_RANGE) - { - log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkCreateBufferView parameter, VkBufferViewType pCreateInfo->viewType, is an unrecognized enumerator"); - return false; - } if(pCreateInfo->format < VK_FORMAT_BEGIN_RANGE || pCreateInfo->format > VK_FORMAT_END_RANGE) { |