Merge vk-gl-cts/vulkan-cts-1.1.3 into vk-gl-cts/vulkan-cts-1.1.4

Change-Id: I7a134ecbc159b4f01dfbb3456ffd9c526a0d9f22

diff --cc external/vulkancts/modules/vulkan/query_pool/vktQueryPoolOcclusionTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmPointerParameterTests.cpp
index 0fb3458,fbacf52..82a58c4
--- 1/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmPointerParameterTests.cpp
--- 2/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmPointerParameterTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmPointerParameterTests.cpp
@@@ -1080,8 -1077,8 +1080,9 @@@ void addGraphicsPointerBufferMemoryVari
                expectedOutput.push_back(2.0f);
  
        extensions.push_back("VK_KHR_variable_pointers");
-       requiredFeatures.coreFeatures.vertexPipelineStoresAndAtomics    = true;
 +      requiredFeatures.coreFeatures.fragmentStoresAndAtomics                  = true;
+       requiredFeatures.extVariablePointers = EXTVARIABLEPOINTERSFEATURES_VARIABLE_POINTERS_STORAGEBUFFER;
+       requiredFeatures.coreFeatures.vertexPipelineStoresAndAtomics = DE_TRUE;
        resources.outputs.push_back(Resource(BufferSp(new Float32Buffer(expectedOutput)), vk::VK_DESCRIPTOR_TYPE_STORAGE_BUFFER));
  
        createTestsForAllStages("buffer_memory_variable_pointers", defaultColors, defaultColors, fragments, resources, extensions, group, requiredFeatures);