Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master

Change-Id: I3e4105213b99ff48e1f733a68f07821e8e5ba422

diff --cc external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.hpp
index 4679d8f,49feef5..99826d0
--- 1/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.hpp
--- 2/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.hpp
+++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.hpp
@@@ -219,10 -220,9 +219,8 @@@ vk::Move<vk::VkPipelineLayout>    makePipe
  vk::Move<vk::VkPipelineLayout>        makePipelineLayoutWithoutDescriptors            (const vk::DeviceInterface& vk, const vk::VkDevice device);
  vk::Move<vk::VkPipeline>              makeComputePipeline                                                     (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkPipelineLayout pipelineLayout, const vk::VkShaderModule shaderModule, const vk::VkSpecializationInfo* specInfo, PipelineCacheData& pipelineCacheData);
  vk::Move<vk::VkRenderPass>            makeRenderPass                                                          (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkFormat colorFormat);
- vk::Move<vk::VkRenderPass>            makeRenderPassWithoutAttachments                        (const vk::DeviceInterface& vk, const vk::VkDevice device);
  vk::Move<vk::VkFramebuffer>           makeFramebuffer                                                         (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkRenderPass renderPass, const vk::VkImageView colorAttachment, const deUint32 width, const deUint32 height, const deUint32 layers);
- vk::Move<vk::VkFramebuffer>           makeFramebufferWithoutAttachments                       (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkRenderPass renderPass);
  vk::Move<vk::VkImageView>             makeImageView                                                           (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkImage image, const vk::VkImageViewType viewType, const vk::VkFormat format, const vk::VkImageSubresourceRange subresourceRange);
 -vk::Move<vk::VkEvent>                 makeEvent                                                                       (const vk::DeviceInterface& vk, const vk::VkDevice device);
  vk::VkBufferImageCopy                 makeBufferImageCopy                                                     (const vk::VkImageSubresourceLayers subresourceLayers, const vk::VkExtent3D extent);
  vk::VkMemoryBarrier                           makeMemoryBarrier                                                       (const vk::VkAccessFlags srcAccessMask, const vk::VkAccessFlags dstAccessMask);
  vk::VkBufferMemoryBarrier             makeBufferMemoryBarrier                                         (const vk::VkAccessFlags srcAccessMask, const vk::VkAccessFlags dstAccessMask, const vk::VkBuffer buffer, const vk::VkDeviceSize offset, const vk::VkDeviceSize bufferSizeBytes);

diff --cc external/vulkancts/modules/vulkan/tessellation/vktTessellationUtil.cpp
Simple merge