summaryrefslogtreecommitdiffstats
path: root/include/vulkan
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2015-12-02 16:08:13 -0800
committerJason Ekstrand <jason.ekstrand@intel.com>2015-12-03 13:43:54 -0800
commita5f19f64c3317c98b984010f144416ce768a3c0b (patch)
tree9c9c4252a777420e52c6c72f01b77a1e6e3c6616 /include/vulkan
parente10dc002e9544500a2247e49a132e18f994f34ee (diff)
downloadexternal_mesa3d-a5f19f64c3317c98b984010f144416ce768a3c0b.zip
external_mesa3d-a5f19f64c3317c98b984010f144416ce768a3c0b.tar.gz
external_mesa3d-a5f19f64c3317c98b984010f144416ce768a3c0b.tar.bz2
vk/0.210.0: Remove the VkShaderStage enum
This made for an unfortunately large amount of work since we were using it fairly heavily internally. However, gl_shader_stage does basically the same things, so it's not too bad.
Diffstat (limited to 'include/vulkan')
-rw-r--r--include/vulkan/vulkan.h15
1 files changed, 1 insertions, 14 deletions
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index f7bde4c..7affe39 100644
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -477,19 +477,6 @@ typedef enum VkComponentSwizzle {
VK_COMPONENT_SWIZZLE_MAX_ENUM = 0x7FFFFFFF
} VkComponentSwizzle;
-typedef enum {
- VK_SHADER_STAGE_VERTEX = 0,
- VK_SHADER_STAGE_TESS_CONTROL = 1,
- VK_SHADER_STAGE_TESS_EVALUATION = 2,
- VK_SHADER_STAGE_GEOMETRY = 3,
- VK_SHADER_STAGE_FRAGMENT = 4,
- VK_SHADER_STAGE_COMPUTE = 5,
- VK_SHADER_STAGE_BEGIN_RANGE = VK_SHADER_STAGE_VERTEX,
- VK_SHADER_STAGE_END_RANGE = VK_SHADER_STAGE_COMPUTE,
- VK_SHADER_STAGE_NUM = (VK_SHADER_STAGE_COMPUTE - VK_SHADER_STAGE_VERTEX + 1),
- VK_SHADER_STAGE_MAX_ENUM = 0x7FFFFFFF
-} VkShaderStage;
-
typedef enum VkVertexInputRate {
VK_VERTEX_INPUT_RATE_VERTEX = 0,
VK_VERTEX_INPUT_RATE_INSTANCE = 1,
@@ -1604,7 +1591,7 @@ typedef struct VkPipelineShaderStageCreateInfo {
VkStructureType sType;
const void* pNext;
VkPipelineShaderStageCreateFlags flags;
- VkShaderStage stage;
+ VkShaderStageFlagBits stage;
VkShaderModule module;
const char* pName;
const VkSpecializationInfo* pSpecializationInfo;