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 eaedb305d00e32cb73369c0a772417525f7521f1..a3b977a0579cbb5edbc8c0930eb610d3cb2947be 100644 (file)
--- 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();