From 0275a8d5d878ff472040c399c5a09015640b8d4f Mon Sep 17 00:00:00 2001 From: Cody Northrop Date: Tue, 18 Aug 2015 14:58:29 -0600 Subject: [PATCH] Bug 14400: Add FORMAT_FEATURES for blits --- include/vulkan.h | 2 ++ layers/param_checker.cpp | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/include/vulkan.h b/include/vulkan.h index 0a802b0..0fa2bc5 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -868,6 +868,8 @@ typedef enum { 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, } VkFormatFeatureFlagBits; typedef VkFlags VkFormatFeatureFlags; diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 27f5524..42e0235 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -409,7 +409,9 @@ bool ValidateEnumerator(VkFormatFeatureFlagBits const& enumerator) VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT | VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | - VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT); + VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT | + VK_FORMAT_FEATURE_BLIT_SOURCE_BIT | + VK_FORMAT_FEATURE_BLIT_DESTINATION_BIT); if(enumerator & (~allFlags)) { return false; @@ -471,6 +473,14 @@ std::string EnumeratorString(VkFormatFeatureFlagBits const& enumerator) { strings.push_back("VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT"); } + if(enumerator & VK_FORMAT_FEATURE_BLIT_SOURCE_BIT) + { + strings.push_back("VK_FORMAT_FEATURE_BLIT_SOURCE_BIT"); + } + if(enumerator & VK_FORMAT_FEATURE_BLIT_DESTINATION_BIT) + { + strings.push_back("VK_FORMAT_FEATURE_BLIT_DESTINATION_BIT"); + } std::string enumeratorString; for(auto const& string : strings) -- 2.7.4