Create MSAA-swapchain windows' VkImages differently

src/libANGLE/renderer/vulkan/SurfaceVk.cpp

@@ -1023,9 +1023,14 @@ angle::Result WindowSurfaceVk::createSwapChain(vk::Context *context,
     {
         const VkImageUsageFlags usage = kSurfaceVkColorImageUsageFlags;
 
-        ANGLE_TRY(mColorImageMS.init(context, gl::TextureType::_2D, vkExtents, format, samples,
-                                     usage, gl::LevelIndex(0), gl::LevelIndex(0), 1, 1,
-                                     robustInit));
+        // Create a multisampled image that will be rendered to, and then resolved to a swapchain
+        // image.  The actual VkImage is created with rotated coordinates to make it easier to do
+        // the resolve.  The ImageHelper::mExtents will have non-rotated extents in order to fit
+        // with the rest of ANGLE, (e.g. which calculates the Vulkan scissor with non-rotated
+        // values and then rotates the final rectangle).
+        ANGLE_TRY(mColorImageMS.initMSAASwapchain(
+            context, gl::TextureType::_2D, vkExtents, Is90DegreeRotation(getPreTransform()), format,
+            samples, usage, gl::LevelIndex(0), gl::LevelIndex(0), 1, 1, robustInit));
         ANGLE_TRY(mColorImageMS.initMemory(context, renderer->getMemoryProperties(),
                                            VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT));
 
@@ -1325,6 +1330,12 @@ angle::Result WindowSurfaceVk::present(ContextVk *contextVk,
         resolveRegion.dstSubresource                = resolveRegion.srcSubresource;
         resolveRegion.dstOffset                     = {};
         resolveRegion.extent                        = image.image.getExtents();
+        // ImageHelper extents are non-rotated.  If the window is 90 or 270 degrees, swap the width
+        // and height.
+        if (Is90DegreeRotation(getPreTransform()))
+        {
+            std::swap(resolveRegion.extent.width, resolveRegion.extent.height);
+        }
 
         mColorImageMS.resolve(&image.image, resolveRegion, commandBuffer);
     }

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -3598,6 +3598,29 @@ angle::Result ImageHelper::init(Context *context,
                         maxLevel, mipLevels, layerCount, isRobustResourceInitEnabled);
 }
 
+angle::Result ImageHelper::initMSAASwapchain(Context *context,
+                                             gl::TextureType textureType,
+                                             const VkExtent3D &extents,
+                                             bool rotatedAspectRation,
+                                             const Format &format,
+                                             GLint samples,
+                                             VkImageUsageFlags usage,
+                                             gl::LevelIndex baseLevel,
+                                             gl::LevelIndex maxLevel,
+                                             uint32_t mipLevels,
+                                             uint32_t layerCount,
+                                             bool isRobustResourceInitEnabled)
+{
+    ANGLE_TRY(initExternal(context, textureType, extents, format, samples, usage,
+                           kVkImageCreateFlagsNone, ImageLayout::Undefined, nullptr, baseLevel,
+                           maxLevel, mipLevels, layerCount, isRobustResourceInitEnabled));
+    if (rotatedAspectRation)
+    {
+        std::swap(mExtents.width, mExtents.height);
+    }
+    return angle::Result::Continue;
+}
+
 angle::Result ImageHelper::initExternal(Context *context,
                                         gl::TextureType textureType,
                                         const VkExtent3D &extents,

src/libANGLE/renderer/vulkan/vk_helpers.h

@@ -1336,6 +1336,18 @@ class ImageHelper final : public Resource, public angle::Subject
                        uint32_t mipLevels,
                        uint32_t layerCount,
                        bool isRobustResourceInitEnabled);
+    angle::Result initMSAASwapchain(Context *context,
+                                    gl::TextureType textureType,
+                                    const VkExtent3D &extents,
+                                    bool rotatedAspectRation,
+                                    const Format &format,
+                                    GLint samples,
+                                    VkImageUsageFlags usage,
+                                    gl::LevelIndex baseLevel,
+                                    gl::LevelIndex maxLevel,
+                                    uint32_t mipLevels,
+                                    uint32_t layerCount,
+                                    bool isRobustResourceInitEnabled);
     angle::Result initExternal(Context *context,
                                gl::TextureType textureType,
                                const VkExtent3D &extents,