From dae24a45a84831fcb93e3a953d78ef30ec89ee98 Mon Sep 17 00:00:00 2001 From: Pyry Haulos Date: Fri, 22 Jan 2016 12:49:33 -0800 Subject: [PATCH] Fix another build issue --- external/vulkancts/modules/vulkan/api/vktApiBufferTests.cpp | 2 +- .../modules/vulkan/pipeline/vktPipelineTimestampTests.cpp | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/external/vulkancts/modules/vulkan/api/vktApiBufferTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiBufferTests.cpp index 5cbae44..474e646 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiBufferTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiBufferTests.cpp @@ -207,7 +207,7 @@ private: 0u // VkFenceCreateFlags flags; }; - const vk::Unique fence = vk::createFence(vk, vkDevice, &fenceParams); + const vk::Unique fence(vk::createFence(vk, vkDevice, &fenceParams)); VK_CHECK(vk.resetFences(vkDevice, 1, &fence.get())); if (vk.queueBindSparse(queue, 1, &bindSparseInfo, *fence) != VK_SUCCESS) diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp index 37a455a..6189e94 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp @@ -567,20 +567,17 @@ Move 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 = { -- 2.7.4