Fix another build issue
authorPyry Haulos <phaulos@google.com>
Fri, 22 Jan 2016 20:49:33 +0000 (12:49 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 22 Jan 2016 20:49:33 +0000 (12:49 -0800)
external/vulkancts/modules/vulkan/api/vktApiBufferTests.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp

index 5cbae44..474e646 100644 (file)
@@ -207,7 +207,7 @@ private:
                                0u                                                                              // VkFenceCreateFlags   flags;
                        };
 
-                       const vk::Unique<vk::VkFence> fence = vk::createFence(vk, vkDevice, &fenceParams);
+                       const vk::Unique<vk::VkFence> fence(vk::createFence(vk, vkDevice, &fenceParams));
 
                        VK_CHECK(vk.resetFences(vkDevice, 1, &fence.get()));
                        if (vk.queueBindSparse(queue, 1, &bindSparseInfo, *fence) != VK_SUCCESS)
index 37a455a..6189e94 100644 (file)
@@ -567,20 +567,17 @@ Move<VkPipeline> SimpleGraphicsPipelineBuilder::buildPipeline(tcu::UVec2 renderS
                +1.0f,                                                      // float                                    maxDepthBounds;
        };
 
-       const VkPipelineTessellationStateCreateInfo* pTessCreateInfo = DE_NULL;
-       VkPipelineTessellationStateCreateInfo        tessStateCreateInfo;
-       if(m_patchControlPoints > 0)
+       const VkPipelineTessellationStateCreateInfo*    pTessCreateInfo         = DE_NULL;
+       const VkPipelineTessellationStateCreateInfo             tessStateCreateInfo     =
        {
-               tessStateCreateInfo =
-               {
                        VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO,  // VkStructureType                          sType;
                        DE_NULL,                                                    // const void*                              pNext;
                        0u,                                                         // VkPipelineTessellationStateCreateFlags   flags;
                        m_patchControlPoints,                                       // deUint32                                 patchControlPoints;
-               };
+       };
 
+       if (m_patchControlPoints > 0)
                pTessCreateInfo = &tessStateCreateInfo;
-       }
 
        const VkGraphicsPipelineCreateInfo graphicsPipelineParams =
        {