From: Jeff Bolz Date: Wed, 13 Jan 2016 04:51:29 +0000 (+0000) Subject: Fix recent regression binding unallocated descriptor set X-Git-Tag: upstream/0.1.0~812^2~166^2~16^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5dd012fb2f776e0724c1ba51f5b658883bd6fc9c;p=platform%2Fupstream%2FVK-GL-CTS.git Fix recent regression binding unallocated descriptor set --- diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp index 17a3a4928..93562a987 100644 --- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp +++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp @@ -1586,7 +1586,8 @@ void ShaderRenderCaseInstance::render (tcu::Surface& result, const QuadGrid& qua vk.cmdBeginRenderPass(*m_cmdBuffer, &renderPassBeginInfo, VK_SUBPASS_CONTENTS_INLINE); vk.cmdBindPipeline(*m_cmdBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, *m_graphicsPipeline); - vk.cmdBindDescriptorSets(*m_cmdBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, *m_pipelineLayout, 0u, 1, &*m_descriptorSet, 0u, DE_NULL); + if (!m_uniformInfos.empty()) + vk.cmdBindDescriptorSets(*m_cmdBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, *m_pipelineLayout, 0u, 1, &*m_descriptorSet, 0u, DE_NULL); vk.cmdBindIndexBuffer(*m_cmdBuffer, *m_indiceBuffer, 0, VK_INDEX_TYPE_UINT16); const deUint32 numberOfVertexAttributes = (deUint32)m_vertexBuffers.size();