Merge master branch into multiple_swapchains_present_req

Change-Id: I153e7a78609651bbfdf4fc0b6675d0ea97763905
Signed-off-by: Iason Paraskevopoulos <iason.paraskevopoulos@arm.com>

diff --cc layer/swapchain_api.cpp
index 72045681a696fa18f5266a24addccfa7253cb329,e46ca87eb14326c0605a0b4a68ccfa9c11429bdb..b7c495fd039fe9b97c5fee178c96738495390ad7
--- 1/layer/swapchain_api.cpp
--- 2/layer/swapchain_api.cpp
+++ b/layer/swapchain_api.cpp
@@@ -209,10 -146,10 +209,10 @@@ wsi_layer_vkQueuePresentKHR(VkQueue que
     {
        VkSwapchainKHR swapc = pPresentInfo->pSwapchains[i];
  
-       wsi::swapchain_base *sc = reinterpret_cast<wsi::swapchain_base *>(swapc);
+       auto *sc = reinterpret_cast<wsi::swapchain_base *>(swapc);
        assert(sc != nullptr);
  
 -      VkResult res = sc->queue_present(queue, pPresentInfo, pPresentInfo->pImageIndices[i]);
 +      res = sc->queue_present(queue, present_info, pPresentInfo->pImageIndices[i]);
  
        if (pPresentInfo->pResults != nullptr)
        {

diff --cc wsi/swapchain_base.cpp
Simple merge

diff --cc wsi/wayland/swapchain.cpp
Simple merge

diff --cc wsi/wayland/swapchain.hpp
Simple merge