Fix crash when window cannot be opened with same resolution

Fix a crash on VK_ERROR_OUT_OF_DATE_KHR when the window of the replayer
cannot be resized to the size of the swapchain at capture time and that
the replayer uses virtual swapchain.

The idea is to store the actual size of the window that could be opened
at replay time in the virtual swapchain so that the virtual swapchain
has the same size as at capture time, and the actual swapchain is the
size of the window. When the image is copied from the virtual image to
the actual image, only a sub-part of the image is copied.

Change-Id: I9609fc524b0faf0f6aed3f1efe570fc5fed86225

framework/application/android_window.cpp

@@ -117,6 +117,11 @@ std::string AndroidWindow::GetWsiExtension() const
     return VK_KHR_ANDROID_SURFACE_EXTENSION_NAME;
 }
 
+VkExtent2D AndroidWindow::GetSize() const
+{
+    return { width_, height_ };
+}
+
 VkResult AndroidWindow::CreateSurface(const encode::VulkanInstanceTable* table,
                                       VkInstance                         instance,
                                       VkFlags                            flags,

framework/application/android_window.h

@@ -71,6 +71,8 @@ class AndroidWindow : public decode::Window
 
     virtual std::string GetWsiExtension() const override;
 
+    virtual VkExtent2D GetSize() const override;
+
     virtual VkResult CreateSurface(const encode::VulkanInstanceTable* table,
                                    VkInstance                         instance,
                                    VkFlags                            flags,

framework/application/display_window.cpp

@@ -30,7 +30,7 @@
 GFXRECON_BEGIN_NAMESPACE(gfxrecon)
 GFXRECON_BEGIN_NAMESPACE(application)
 
-DisplayWindow::DisplayWindow(DisplayContext* display_context) : display_context_(display_context)
+DisplayWindow::DisplayWindow(DisplayContext* display_context) : display_context_(display_context), width_(0), height_(0)
 {
     assert(display_context_ != nullptr);
 }
@@ -195,11 +195,22 @@ VkResult DisplayWindow::SelectPlane(const encode::VulkanInstanceTable* table,
     return VK_ERROR_INITIALIZATION_FAILED;
 }
 
+void DisplayWindow::SetSize(const uint32_t width, const uint32_t height)
+{
+    width_  = width;
+    height_ = height;
+}
+
 std::string DisplayWindow::GetWsiExtension() const
 {
     return VK_KHR_DISPLAY_EXTENSION_NAME;
 }
 
+VkExtent2D DisplayWindow::GetSize() const
+{
+    return { width_, height_ };
+}
+
 VkResult DisplayWindow::CreateSurface(const encode::VulkanInstanceTable* table,
                                       VkInstance                         instance,
                                       VkFlags                            flags,
@@ -241,6 +252,9 @@ VkResult DisplayWindow::CreateSurface(const encode::VulkanInstanceTable* table,
             return error;
         }
 
+        width_  = mode_props.parameters.visibleRegion.width;
+        height_ = mode_props.parameters.visibleRegion.height;
+
         VkExtent2D image_extent;
         image_extent.width  = mode_props.parameters.visibleRegion.width;
         image_extent.height = mode_props.parameters.visibleRegion.height;

framework/application/display_window.h

@@ -55,9 +55,9 @@ class DisplayWindow : public decode::Window
 
     virtual void SetPosition(const int32_t, const int32_t) override {}
 
-    virtual void SetSize(const uint32_t, const uint32_t) override{};
+    virtual void SetSize(const uint32_t width, const uint32_t height) override;
 
-    virtual void SetSizePreTransform(const uint32_t, const uint32_t, const uint32_t) override{};
+    virtual void SetSizePreTransform(const uint32_t, const uint32_t, const uint32_t) override {}
 
     virtual void SetVisibility(bool) override {}
 
@@ -67,6 +67,8 @@ class DisplayWindow : public decode::Window
 
     virtual std::string GetWsiExtension() const override;
 
+    virtual VkExtent2D GetSize() const override;
+
     virtual VkResult CreateSurface(const encode::VulkanInstanceTable* table,
                                    VkInstance                         instance,
                                    VkFlags                            flags,
@@ -94,6 +96,9 @@ class DisplayWindow : public decode::Window
 
   private:
     DisplayContext* display_context_;
+
+    uint32_t width_;
+    uint32_t height_;
 };
 
 class DisplayWindowFactory : public decode::WindowFactory

framework/application/headless_window.cpp

@@ -47,10 +47,11 @@ bool HeadlessWindow::Create(const std::string& title,
     GFXRECON_UNREFERENCED_PARAMETER(title);
     GFXRECON_UNREFERENCED_PARAMETER(xpos);
     GFXRECON_UNREFERENCED_PARAMETER(ypos);
-    GFXRECON_UNREFERENCED_PARAMETER(width);
-    GFXRECON_UNREFERENCED_PARAMETER(height);
     GFXRECON_UNREFERENCED_PARAMETER(force_windowed);
 
+    width_  = width;
+    height_ = height;
+
     return true;
 }
 
@@ -72,14 +73,14 @@ void HeadlessWindow::SetPosition(const int32_t x, const int32_t y)
 
 void HeadlessWindow::SetSize(const uint32_t width, const uint32_t height)
 {
-    GFXRECON_UNREFERENCED_PARAMETER(width);
-    GFXRECON_UNREFERENCED_PARAMETER(height);
+    width_  = width;
+    height_ = height;
 }
 
 void HeadlessWindow::SetSizePreTransform(const uint32_t width, const uint32_t height, const uint32_t pre_transform)
 {
-    GFXRECON_UNREFERENCED_PARAMETER(width);
-    GFXRECON_UNREFERENCED_PARAMETER(height);
+    width_  = width;
+    height_ = height;
     GFXRECON_UNREFERENCED_PARAMETER(pre_transform);
 }
 
@@ -102,6 +103,11 @@ std::string HeadlessWindow::GetWsiExtension() const
     return VK_EXT_HEADLESS_SURFACE_EXTENSION_NAME;
 }
 
+VkExtent2D HeadlessWindow::GetSize() const
+{
+    return { width_, height_ };
+}
+
 VkResult HeadlessWindow::CreateSurface(const encode::VulkanInstanceTable* table,
                                        VkInstance                         instance,
                                        VkFlags                            flags,

framework/application/headless_window.h

@@ -65,6 +65,8 @@ class HeadlessWindow : public decode::Window
 
     virtual std::string GetWsiExtension() const override;
 
+    virtual VkExtent2D GetSize() const override;
+
     virtual VkResult CreateSurface(const encode::VulkanInstanceTable* table,
                                    VkInstance                         instance,
                                    VkFlags                            flags,
@@ -75,6 +77,9 @@ class HeadlessWindow : public decode::Window
 
   private:
     HeadlessContext* headless_context_;
+
+    uint32_t width_;
+    uint32_t height_;
 };
 
 class HeadlessWindowFactory : public decode::WindowFactory

framework/application/metal_window.h

@@ -36,7 +36,7 @@ GFXRECON_BEGIN_NAMESPACE(application)
 class MetalContext;
 class MetalWindow : public decode::Window
 {
-public:
+  public:
     MetalWindow(MetalContext* metal_context);
 
     ~MetalWindow() override;
@@ -66,6 +66,8 @@ class MetalWindow : public decode::Window
 
     std::string GetWsiExtension() const override;
 
+    VkExtent2D GetSize() const override;
+
     VkResult CreateSurface(const encode::VulkanInstanceTable* table,
                            VkInstance                         instance,
                            VkFlags                            flags,
@@ -75,21 +77,25 @@ class MetalWindow : public decode::Window
 
   private:
     GFXReconWindowDelegate* window_delegate_;
-    MetalContext* metal_context_;
-    NSWindow*     window_;
-    CAMetalLayer* layer_;
-    uint32_t      width_;
-    uint32_t      height_;
+    MetalContext*           metal_context_;
+    NSWindow*               window_;
+    CAMetalLayer*           layer_;
+    uint32_t                width_;
+    uint32_t                height_;
 };
 
 class MetalWindowFactory : public decode::WindowFactory
 {
-public:
+  public:
     MetalWindowFactory(MetalContext* metal_context);
 
     const char* GetSurfaceExtensionName() const override { return VK_EXT_METAL_SURFACE_EXTENSION_NAME; }
 
-    decode::Window* Create(const int32_t x, const int32_t y, const uint32_t width, const uint32_t height, bool force_windowed = false) override;
+    decode::Window* Create(const int32_t  x,
+                           const int32_t  y,
+                           const uint32_t width,
+                           const uint32_t height,
+                           bool           force_windowed = false) override;
 
     void Destroy(decode::Window* window) override;