summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2015-11-30 18:05:00 -0800
committerJason Ekstrand <[email protected]>2015-12-03 13:43:52 -0800
commit7f2284063df569df40f68074833f1518005d348d (patch)
tree6a5f6434d4d04f2307bebeac8e2f44daebf25750 /include
parent1ab9f843bc40c54daeb94676131e8323d4f2359f (diff)
vk/0.210.0: s/raster/rasterization/
Diffstat (limited to 'include')
-rw-r--r--include/vulkan/vulkan.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 2c0c5a53c49..93c9bb488e7 100644
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -151,7 +151,7 @@ typedef enum {
VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO = 17,
VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO = 18,
VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO = 19,
- VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO = 20,
+ VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO = 20,
VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO = 21,
VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO = 22,
VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO = 23,
@@ -1696,7 +1696,7 @@ typedef struct VkPipelineViewportStateCreateInfo {
const VkRect2D* pScissors;
} VkPipelineViewportStateCreateInfo;
-typedef struct {
+typedef struct VkPipelineRasterizationStateCreateInfo {
VkStructureType sType;
const void* pNext;
VkPipelineRasterizationStateCreateFlags flags;
@@ -1710,13 +1710,13 @@ typedef struct {
float depthBiasClamp;
float depthBiasSlopeFactor;
float lineWidth;
-} VkPipelineRasterStateCreateInfo;
+} VkPipelineRasterizationStateCreateInfo;
typedef struct VkPipelineMultisampleStateCreateInfo {
VkStructureType sType;
const void* pNext;
VkPipelineMultisampleStateCreateFlags flags;
- uint32_t rasterSamples;
+ VkSampleCountFlagBits rasterizationSamples;
VkBool32 sampleShadingEnable;
float minSampleShading;
const VkSampleMask* pSampleMask;
@@ -1789,7 +1789,7 @@ typedef struct VkGraphicsPipelineCreateInfo {
const VkPipelineInputAssemblyStateCreateInfo* pInputAssemblyState;
const VkPipelineTessellationStateCreateInfo* pTessellationState;
const VkPipelineViewportStateCreateInfo* pViewportState;
- const VkPipelineRasterStateCreateInfo* pRasterState;
+ const VkPipelineRasterizationStateCreateInfo* pRasterizationState;
const VkPipelineMultisampleStateCreateInfo* pMultisampleState;
const VkPipelineDepthStencilStateCreateInfo* pDepthStencilState;
const VkPipelineColorBlendStateCreateInfo* pColorBlendState;