Ubo: add missing multisample params
authorDaniel Hegedus <dhegedus.uszeged@partner.samsung.com>
Thu, 17 Dec 2015 16:55:41 +0000 (17:55 +0100)
committerDaniel Hegedus <dhegedus.uszeged@partner.samsung.com>
Thu, 17 Dec 2015 16:55:41 +0000 (17:55 +0100)
external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp

index cb869ea..ffaea2d 100644 (file)
@@ -1864,7 +1864,7 @@ vk::Move<VkPipeline> 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<VkPipeline> 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<VkPipeline> 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;