diff --git a/inc/hgl/graph/vulkan/VKPipeline.h b/inc/hgl/graph/vulkan/VKPipeline.h index 77d5d385..0f8182b7 100644 --- a/inc/hgl/graph/vulkan/VKPipeline.h +++ b/inc/hgl/graph/vulkan/VKPipeline.h @@ -58,7 +58,7 @@ class PipelineCreater VkPipelineRasterizationStateCreateInfo rasterizer; - VkPipelineMultisampleStateCreateInfo multisampling; + VkPipelineMultisampleStateCreateInfo multisample; VkSampleMask sample_mask[MAX_SAMPLE_MASK_COUNT]; VkPipelineDepthStencilStateCreateInfo depthStencilState; @@ -118,8 +118,8 @@ public: void SetSamleCount( VkSampleCountFlagBits sc) { - multisampling.sampleShadingEnable=(sc==VK_SAMPLE_COUNT_1_BIT?VK_FALSE:VK_TRUE); - multisampling.rasterizationSamples=sc; + multisample.sampleShadingEnable=(sc==VK_SAMPLE_COUNT_1_BIT?VK_FALSE:VK_TRUE); + multisample.rasterizationSamples=sc; } bool SetColorWriteMask(uint index,bool r,bool g,bool b,bool a) diff --git a/src/RenderDevice/Vulkan/POD/VKPipelineCreateInfo.POD.cpp b/src/RenderDevice/Vulkan/POD/VKPipelineCreateInfo.POD.cpp index 73437def..a623d473 100644 --- a/src/RenderDevice/Vulkan/POD/VKPipelineCreateInfo.POD.cpp +++ b/src/RenderDevice/Vulkan/POD/VKPipelineCreateInfo.POD.cpp @@ -66,7 +66,7 @@ bool PipelineCreater::LoadFromMemory(uchar *data,uint size) CHECK_SIZE_AND_COPY(tessellation,VkPipelineTessellationStateCreateInfo); CHECK_SIZE_AND_COPY(rasterizer,VkPipelineRasterizationStateCreateInfo); - CHECK_SIZE_AND_COPY(multisampling,VkPipelineMultisampleStateCreateInfo); + CHECK_SIZE_AND_COPY(multisample,VkPipelineMultisampleStateCreateInfo); const uint8 count=*(uint8 *)data; ++data; @@ -74,13 +74,13 @@ bool PipelineCreater::LoadFromMemory(uchar *data,uint size) if(count>0) { memcpy(sample_mask,data,count); - multisampling.pSampleMask=sample_mask; + multisample.pSampleMask=sample_mask; data+=count; size=count; } else { - multisampling.pSampleMask=nullptr; + multisample.pSampleMask=nullptr; } CHECK_SIZE_AND_COPY(depthStencilState,VkPipelineDepthStencilStateCreateInfo); diff --git a/src/RenderDevice/Vulkan/VKPipeline.cpp b/src/RenderDevice/Vulkan/VKPipeline.cpp index c30d89b3..ee62313a 100644 --- a/src/RenderDevice/Vulkan/VKPipeline.cpp +++ b/src/RenderDevice/Vulkan/VKPipeline.cpp @@ -104,17 +104,17 @@ PipelineCreater::PipelineCreater(Device *dev,const Material *material,const uint pipelineInfo.pRasterizationState = &rasterizer; - multisampling.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; - multisampling.pNext = nullptr; - multisampling.flags = 0; - multisampling.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; - multisampling.sampleShadingEnable = VK_FALSE; - multisampling.minSampleShading = 0.0; - multisampling.pSampleMask = nullptr; - multisampling.alphaToCoverageEnable = VK_FALSE; - multisampling.alphaToOneEnable = VK_FALSE; + multisample.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; + multisample.pNext = nullptr; + multisample.flags = 0; + multisample.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; + multisample.sampleShadingEnable = VK_FALSE; + multisample.minSampleShading = 0.0; + multisample.pSampleMask = nullptr; + multisample.alphaToCoverageEnable = VK_FALSE; + multisample.alphaToOneEnable = VK_FALSE; - pipelineInfo.pMultisampleState = &multisampling; + pipelineInfo.pMultisampleState = &multisample; depthStencilState.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO; depthStencilState.pNext = nullptr; @@ -188,7 +188,7 @@ PipelineCreater::PipelineCreater(Device *dev,const Material *material,uchar *dat pipelineInfo.pInputAssemblyState=&inputAssembly; pipelineInfo.pTessellationState =&tessellation; pipelineInfo.pRasterizationState=&rasterizer; - pipelineInfo.pMultisampleState =&multisampling; + pipelineInfo.pMultisampleState =&multisample; pipelineInfo.pDepthStencilState =&depthStencilState; pipelineInfo.pColorBlendState =&colorBlending;