From 96cbb83d1ce2b72d9a5f620051c63b748c11cca5 Mon Sep 17 00:00:00 2001 From: Daniel Hegedus Date: Thu, 17 Dec 2015 17:55:41 +0100 Subject: [PATCH] Ubo: add missing multisample params --- .../modules/vulkan/ubo/vktUniformBlockCase.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp b/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp index cb869ea..ffaea2d 100644 --- a/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp +++ b/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp @@ -1864,7 +1864,7 @@ vk::Move UniformBlockCaseInstance::createPipeline (vk::VkShaderModul &scissor, // const VkRect2D* pScissors; }; - const VkPipelineRasterizationStateCreateInfo rasterStateParams = + const VkPipelineRasterizationStateCreateInfo rasterStateParams = { VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO, // VkStructureType sType; DE_NULL, // const void* pNext; @@ -1881,6 +1881,19 @@ vk::Move UniformBlockCaseInstance::createPipeline (vk::VkShaderModul 1.0f, // float lineWidth; }; + const VkPipelineMultisampleStateCreateInfo multisampleStateParams = + { + VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO, // VkStructureType sType; + DE_NULL, // const void* pNext; + 0u, // VkPipelineMultisampleStateCreateFlags flags; + VK_SAMPLE_COUNT_1_BIT, // VkSampleCountFlagBits rasterizationSamples; + VK_FALSE, // VkBool32 sampleShadingEnable; + 0.0f, // float minSampleShading; + DE_NULL, // const VkSampleMask* pSampleMask; + VK_FALSE, // VkBool32 alphaToCoverageEnable; + VK_FALSE // VkBool32 alphaToOneEnable; + }; + const VkPipelineColorBlendAttachmentState colorBlendAttachmentState = { false, // VkBool32 blendEnable; @@ -1927,7 +1940,7 @@ vk::Move UniformBlockCaseInstance::createPipeline (vk::VkShaderModul DE_NULL, // const VkPipelineTessellationStateCreateInfo* pTessellationState; &viewportStateParams, // const VkPipelineViewportStateCreateInfo* pViewportState; &rasterStateParams, // const VkPipelineRasterizationStateCreateInfo* pRasterizationState; - DE_NULL, // const VkPipelineMultisampleStateCreateInfo* pMultisampleState; + &multisampleStateParams, // const VkPipelineMultisampleStateCreateInfo* pMultisampleState; DE_NULL, // const VkPipelineDepthStencilStateCreateInfo* pDepthStencilState; &colorBlendStateParams, // const VkPipelineColorBlendStateCreateInfo* pColorBlendState; &dynamicStateInfo, // const VkPipelineDynamicStateCreateInfo* pDynamicState; -- 2.7.4