misc: Add barrier pipeline stage BOTTOM_OF_PIPE; for header vers 219

Use BOTTOM_PIPE for barrier for WSI presentation.

diff --git a/demos/cube.c b/demos/cube.c
index d5ac88c6310bd13ab3604cf4563ed73298045604..4c29c1a36c49ab3303dfb3e4dc414b65007567a2 100644 (file)
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -706,7 +706,7 @@ static void demo_draw(struct demo *demo)
     // okay to render to the image.
 
 // FIXME/TODO: DEAL WITH VK_IMAGE_LAYOUT_PRESENT_SRC_KHR
-    VkPipelineStageFlags pipe_stage_flags = VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT;
+    VkPipelineStageFlags pipe_stage_flags = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE;
     VkSubmitInfo submit_info = {
         .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
         .pNext = NULL,

diff --git a/demos/tri.c b/demos/tri.c
index d4874e3285d40a7724cf8143dcbcb45344886ea4..ea110680292f6a65e871550ea880f0434485dbea 100644 (file)
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -508,7 +508,7 @@ static void demo_draw(struct demo *demo)
 // FIXME/TODO: DEAL WITH VK_IMAGE_LAYOUT_PRESENT_SRC_KHR
     demo_draw_build_cmd(demo);
     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 = {
         .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
         .pNext = NULL,

diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 024f80ceda2653cb22282683512493aa58e98807..d071ea8d51f1e93dfa369ce361ee69eee80cef4e 100644 (file)
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -41,7 +41,7 @@ extern "C" {
     ((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 @@ typedef enum VkPipelineStageFlagBits {
     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 c71fa5f71b39229bcded26fc9d332fd9189feec3..59807816ac737af4b9eda741baed6d7554e3bc37 100644 (file)
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -1246,23 +1246,23 @@ static
 bool ValidateEnumerator(VkPipelineStageFlagBits const& enumerator)
 {
     VkPipelineStageFlagBits allFlags = (VkPipelineStageFlagBits)(
-        VK_PIPELINE_STAGE_ALL_COMMANDS_BIT|
-        VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT|
+        VK_PIPELINE_STAGE_ALL_COMMANDS_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_COLOR_ATTACHMENT_OUTPUT_BIT |
-        VK_PIPELINE_STAGE_ALL_COMMANDS_BIT |
-        VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT |
         VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |
-        VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT |
+        VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |
+        VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |
         VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |
-        VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT |
-        VK_PIPELINE_STAGE_VERTEX_SHADER_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_GEOMETRY_SHADER_BIT |
-        VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |
-        VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
+        VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT |
+        VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT);
     if(enumerator & (~allFlags))
     {
         return false;
@@ -1300,9 +1300,9 @@ std::string EnumeratorString(VkPipelineStageFlagBits const& enumerator)
     {
         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)
     {