Vulkan: Support EGL_ANGLE_surface_orientation for vertical surface flipping.

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -14,6 +14,7 @@
 #include "common/utilities.h"
 #include "libANGLE/Context.h"
 #include "libANGLE/Program.h"
+#include "libANGLE/Surface.h"
 #include "libANGLE/renderer/vulkan/BufferVk.h"
 #include "libANGLE/renderer/vulkan/CommandGraph.h"
 #include "libANGLE/renderer/vulkan/CompilerVk.h"
@@ -52,7 +53,8 @@ ContextVk::ContextVk(const gl::ContextState &state, RendererVk *renderer)
       mCurrentDrawMode(gl::PrimitiveMode::InvalidEnum),
       mTexturesDirty(false),
       mVertexArrayBindingHasChanged(false),
-      mClearColorMask(kAllColorChannelsMask)
+      mClearColorMask(kAllColorChannelsMask),
+      mFlipYForCurrentSurface(false)
 {
     memset(&mClearColorValue, 0, sizeof(mClearColorValue));
     memset(&mClearDepthStencilValue, 0, sizeof(mClearDepthStencilValue));
@@ -378,10 +380,10 @@ void ContextVk::popDebugGroup()
     UNIMPLEMENTED();
 }
 
-bool ContextVk::isViewportFlipEnabled()
+bool ContextVk::isViewportFlipEnabled() const
 {
     gl::Framebuffer *framebuffer = mState.getState().getDrawFramebuffer();
-    return framebuffer->isDefault() && mRenderer->getFeatures().flipViewportY;
+    return framebuffer->isDefault() && mFlipYForCurrentSurface;
 }
 
 void ContextVk::updateColorMask(const gl::BlendState &blendState)
@@ -671,8 +673,14 @@ GLint64 ContextVk::getTimestamp()
     return GLint64();
 }
 
-void ContextVk::onMakeCurrent(const gl::Context * /*context*/)
+void ContextVk::onMakeCurrent(const gl::Context *context)
 {
+    // Flip viewports if FeaturesVk::flipViewportY is enabled and the user did not request that the
+    // surface is flipped.
+    egl::Surface *drawSurface = context->getCurrentDrawSurface();
+    mFlipYForCurrentSurface =
+        drawSurface != nullptr && mRenderer->getFeatures().flipViewportY &&
+        !IsMaskFlagSet(drawSurface->getOrientation(), EGL_SURFACE_ORIENTATION_INVERT_Y_ANGLE);
 }
 
 gl::Caps ContextVk::getNativeCaps() const

src/libANGLE/renderer/vulkan/ContextVk.h

@@ -87,7 +87,7 @@ class ContextVk : public ContextImpl
     void pushDebugGroup(GLenum source, GLuint id, GLsizei length, const char *message) override;
     void popDebugGroup() override;
 
-    bool isViewportFlipEnabled();
+    bool isViewportFlipEnabled() const;
 
     // State sync with dirty bits.
     gl::Error syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits) override;
@@ -200,6 +200,10 @@ class ContextVk : public ContextImpl
     VkColorComponentFlags mClearColorMask;
 
     IncompleteTextureSet mIncompleteTextures;
+
+    // If the current surface bound to this context wants to have all rendering flipped vertically.
+    // Updated on calls to onMakeCurrent.
+    bool mFlipYForCurrentSurface;
 };
 }  // namespace rx
 

src/libANGLE/renderer/vulkan/DisplayVk.cpp

@@ -161,6 +161,7 @@ gl::Version DisplayVk::getMaxSupportedESVersion() const
 
 void DisplayVk::generateExtensions(egl::DisplayExtensions *outExtensions) const
 {
+    outExtensions->surfaceOrientation = true;
 }
 
 void DisplayVk::generateCaps(egl::Caps *outCaps) const

src/libANGLE/renderer/vulkan/vk_caps_utils.cpp

@@ -224,7 +224,9 @@ egl::Config GenerateDefaultConfig(const VkPhysicalDeviceProperties &physicalDevi
     config.sampleBuffers         = (sampleCount > 0) ? 1 : 0;
     config.samples               = sampleCount;
     config.surfaceType           = EGL_WINDOW_BIT | EGL_PBUFFER_BIT;
-    config.optimalOrientation    = 0;
+    // Vulkan surfaces use a different origin than OpenGL, always prefer to be flipped vertically if
+    // possible.
+    config.optimalOrientation    = EGL_SURFACE_ORIENTATION_INVERT_Y_ANGLE;
     config.transparentType       = EGL_NONE;
     config.transparentRedValue   = 0;
     config.transparentGreenValue = 0;