misc: Add barrier pipeline stage BOTTOM_OF_PIPE; for header vers 219
Use BOTTOM_PIPE for barrier for WSI presentation.
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 024f80c..d071ea8 100644
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -41,7 +41,7 @@
((major << 22) | (minor << 12) | patch)
// Vulkan API version supported by this file
-#define VK_API_VERSION VK_MAKE_VERSION(0, 218, 0)
+#define VK_API_VERSION VK_MAKE_VERSION(0, 219, 0)
#define VK_NULL_HANDLE 0
@@ -877,9 +877,10 @@
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT = 0x00000400,
VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT = 0x00000800,
VK_PIPELINE_STAGE_TRANSFER_BIT = 0x00001000,
- VK_PIPELINE_STAGE_HOST_BIT = 0x00002000,
- VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT = 0x00004000,
- VK_PIPELINE_STAGE_ALL_COMMANDS_BIT = 0x00008000,
+ VK_PIPELINE_STAGE_BOTTOM_OF_PIPE = 0x00002000,
+ VK_PIPELINE_STAGE_HOST_BIT = 0x00004000,
+ VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT = 0x00008000,
+ VK_PIPELINE_STAGE_ALL_COMMANDS_BIT = 0x00010000,
} VkPipelineStageFlagBits;
typedef VkFlags VkPipelineStageFlags;
typedef VkFlags VkMemoryMapFlags;
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index c71fa5f..5980781 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -1246,23 +1246,23 @@
bool ValidateEnumerator(VkPipelineStageFlagBits const& enumerator)
{
VkPipelineStageFlagBits allFlags = (VkPipelineStageFlagBits)(
- VK_PIPELINE_STAGE_ALL_COMMANDS_BIT|
- VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT|
- VK_PIPELINE_STAGE_HOST_BIT |
- VK_PIPELINE_STAGE_TRANSFER_BIT |
- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT |
- VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT |
+ VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT |
+ VK_PIPELINE_STAGE_HOST_BIT |
+ VK_PIPELINE_STAGE_BOTTOM_OF_PIPE |
+ VK_PIPELINE_STAGE_TRANSFER_BIT |
VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |
- VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT |
- VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |
- VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT |
- VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |
- VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT |
- VK_PIPELINE_STAGE_VERTEX_INPUT_BIT |
- VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT |
+ VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |
VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |
- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
+ VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |
+ VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT |
+ VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |
+ VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT |
+ VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT |
+ VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |
+ VK_PIPELINE_STAGE_VERTEX_INPUT_BIT |
+ VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT |
+ VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT);
if(enumerator & (~allFlags))
{
return false;
@@ -1300,9 +1300,9 @@
{
strings.push_back("VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT");
}
- if(enumerator & VK_PIPELINE_STAGE_ALL_COMMANDS_BIT)
+ if(enumerator & VK_PIPELINE_STAGE_BOTTOM_OF_PIPE)
{
- strings.push_back("VK_PIPELINE_STAGE_ALL_COMMANDS_BIT");
+ strings.push_back("VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT");
}
if(enumerator & VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT)
{
diff --git a/tests/vktestframework.cpp b/tests/vktestframework.cpp
index e98d9a4..6e13b05 100644
--- a/tests/vktestframework.cpp
+++ b/tests/vktestframework.cpp
@@ -676,7 +676,7 @@
// engine has fully released ownership to the application, and it is
// okay to render to the image.
VkFence nullFence = { VK_NULL_HANDLE };
- VkPipelineStageFlags pipe_stage_flags = VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT;
+ VkPipelineStageFlags pipe_stage_flags = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE;
VkSubmitInfo submit_info;
submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
submit_info.pNext = NULL;