From: Samuel Iglesias Gonsálvez Date: Mon, 4 Sep 2017 07:16:30 +0000 (+0200) Subject: Fix bug when setting descriptor set layouts X-Git-Tag: upstream/0.1.0~9^2~18 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=296bd3ac6600768d59f8fc045d7a2f4abfd0c707;p=platform%2Fupstream%2FVK-GL-CTS.git Fix bug when setting descriptor set layouts Affects: dEQP-VK.glsl.builtin_var.fragdepth.* dEQP-VK.glsl.builtin_var.fragcoord_msaa.* Fixes crashes added by 595b5f763a8f6ef1c68bfd133a55ded9c25ac101 (CL#1017). Components: Vulkan VK-GL-CTS issue: 659 Change-Id: I1464ff6b213f38a2ade08f1e9b11dad422ee3f21 (cherry picked from commit 153979d342b54aa04cb2038e158ff3e3c742d8b8) --- diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp index eaedb30..a3b977a 100644 --- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp +++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp @@ -953,8 +953,8 @@ TestStatus BuiltinFragDepthCaseInstance::iterate (void) drawState.numSamples = m_samples; drawState.sampleShadingEnable = true; - vulkanProgram.descriptorSetLayout = descriptorSetLayout; - vulkanProgram.descriptorSet = descriptorSet; + vulkanProgram.descriptorSetLayout = *descriptorSetLayout; + vulkanProgram.descriptorSet = *descriptorSet; VulkanDrawContext vulkanDrawContext(m_context, drawState, drawCallData, vulkanProgram); vulkanDrawContext.draw(); @@ -1502,8 +1502,8 @@ TestStatus BuiltinFragCoordMsaaCaseInstance::iterate (void) drawState.numSamples = m_sampleCount; drawState.sampleShadingEnable = true; - vulkanProgram.descriptorSetLayout = descriptorSetLayout; - vulkanProgram.descriptorSet = descriptorSet; + vulkanProgram.descriptorSetLayout = *descriptorSetLayout; + vulkanProgram.descriptorSet = *descriptorSet; VulkanDrawContext vulkanDrawContext(m_context, drawState, drawCallData, vulkanProgram); vulkanDrawContext.draw();