From d69e2407bdedd40bc2ac431749676f05d381c76d Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Wed, 16 Sep 2015 15:47:14 -0600 Subject: bug 14437: Remove VK_PIPELINE_STAGE_TRANSITION_BIT --- include/vulkan.h | 5 ++--- layers/param_checker.cpp | 5 ----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/vulkan.h b/include/vulkan.h index 840c8403..25d25eec 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -1021,10 +1021,9 @@ typedef enum { VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT = 0x00000400, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT = 0x00000800, VK_PIPELINE_STAGE_TRANSFER_BIT = 0x00001000, - VK_PIPELINE_STAGE_TRANSITION_BIT = 0x00002000, - VK_PIPELINE_STAGE_HOST_BIT = 0x00004000, + VK_PIPELINE_STAGE_HOST_BIT = 0x00002000, VK_PIPELINE_STAGE_ALL_GRAPHICS = 0x000007FF, - VK_PIPELINE_STAGE_ALL_GPU_COMMANDS = 0x00003FFF, + VK_PIPELINE_STAGE_ALL_GPU_COMMANDS = 0x00001FFF, } VkPipelineStageFlagBits; typedef VkFlags VkPipelineStageFlags; diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index ea31546c..583363ae 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -1343,7 +1343,6 @@ bool ValidateEnumerator(VkPipelineStageFlagBits const& enumerator) VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT | VK_PIPELINE_STAGE_ALL_GPU_COMMANDS | VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT | - VK_PIPELINE_STAGE_TRANSITION_BIT | VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT | VK_PIPELINE_STAGE_TESS_CONTROL_SHADER_BIT | VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | @@ -1395,10 +1394,6 @@ std::string EnumeratorString(VkPipelineStageFlagBits const& enumerator) { strings.push_back("VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT"); } - if(enumerator & VK_PIPELINE_STAGE_TRANSITION_BIT) - { - strings.push_back("VK_PIPELINE_STAGE_TRANSITION_BIT"); - } if(enumerator & VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT) { strings.push_back("VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT"); -- cgit v1.2.3