diff options
| author | Jason Ekstrand <[email protected]> | 2015-11-30 18:12:55 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-12-03 13:43:52 -0800 |
| commit | 4cf0b57bbfd5526e63c63d3a6fa6b4cadd128a98 (patch) | |
| tree | 3a3447523d64215412d270a082a7cd8e9388019c /include/vulkan | |
| parent | 7f2284063df569df40f68074833f1518005d348d (diff) | |
vk/0.210.0: Rename ChannelFlags to ColorComponentFlags
Diffstat (limited to 'include/vulkan')
| -rw-r--r-- | include/vulkan/vulkan.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index 93c9bb488e7..921c3bca830 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -949,14 +949,6 @@ typedef VkFlags VkShaderModuleCreateFlags; typedef VkFlags VkPipelineCacheCreateFlags; typedef VkFlags VkShaderCreateFlags; -typedef enum { - VK_CHANNEL_R_BIT = 0x00000001, - VK_CHANNEL_G_BIT = 0x00000002, - VK_CHANNEL_B_BIT = 0x00000004, - VK_CHANNEL_A_BIT = 0x00000008, -} VkChannelFlagBits; -typedef VkFlags VkChannelFlags; - typedef enum VkPipelineCreateFlagBits { VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT = 0x00000001, VK_PIPELINE_CREATE_ALLOW_DERIVATIVES_BIT = 0x00000002, @@ -991,6 +983,14 @@ typedef VkFlags VkCullModeFlags; typedef VkFlags VkPipelineMultisampleStateCreateFlags; typedef VkFlags VkPipelineDepthStencilStateCreateFlags; typedef VkFlags VkPipelineColorBlendStateCreateFlags; + +typedef enum VkColorComponentFlagBits { + VK_COLOR_COMPONENT_R_BIT = 0x00000001, + VK_COLOR_COMPONENT_G_BIT = 0x00000002, + VK_COLOR_COMPONENT_B_BIT = 0x00000004, + VK_COLOR_COMPONENT_A_BIT = 0x00000008, +} VkColorComponentFlagBits; +typedef VkFlags VkColorComponentFlags; typedef VkFlags VkPipelineDynamicStateCreateFlags; typedef VkFlags VkPipelineLayoutCreateFlags; typedef VkFlags VkShaderStageFlags; @@ -1757,7 +1757,7 @@ typedef struct VkPipelineColorBlendAttachmentState { VkBlendFactor srcAlphaBlendFactor; VkBlendFactor dstAlphaBlendFactor; VkBlendOp alphaBlendOp; - VkChannelFlags channelWriteMask; + VkColorComponentFlags colorWriteMask; } VkPipelineColorBlendAttachmentState; typedef struct VkPipelineColorBlendStateCreateInfo { |