Add EGL_WINDOW_BIT to all Ozone configs' EGL_SURFACE_TYPE

src/libANGLE/renderer/gl/egl/DisplayEGL.cpp

@@ -461,8 +461,7 @@ egl::ConfigSet DisplayEGL::generateConfigs()
                                    &config.colorComponentType, "EGL_EXT_pixel_format_float",
                                    EGL_COLOR_COMPONENT_TYPE_FIXED_EXT);
 
-        // Pixmaps are not supported on EGL, make sure the config doesn't expose them.
-        config.surfaceType &= ~EGL_PIXMAP_BIT;
+        config.surfaceType = fixSurfaceType(config.surfaceType);
 
         if (config.colorBufferType == EGL_RGB_BUFFER)
         {
@@ -809,4 +808,10 @@ ExternalImageSiblingImpl *DisplayEGL::createExternalImageSibling(const gl::Conte
     }
 }
 
+EGLint DisplayEGL::fixSurfaceType(EGLint surfaceType) const
+{
+    // Pixmaps are not supported on EGL, make sure the config doesn't expose them.
+    return surfaceType & ~EGL_PIXMAP_BIT;
+}
+
 }  // namespace rx

src/libANGLE/renderer/gl/egl/DisplayEGL.h

@@ -112,6 +112,8 @@ class DisplayEGL : public DisplayGL
 
     egl::Error makeCurrentSurfaceless(gl::Context *context) override;
 
+    virtual EGLint fixSurfaceType(EGLint surfaceType) const;
+
     template <typename T>
     void getConfigAttrib(EGLConfig config, EGLint attribute, T *value) const;
 

src/libANGLE/renderer/gl/egl/gbm/DisplayGbm.cpp

@@ -1037,4 +1037,12 @@ WorkerContext *DisplayGbm::createWorkerContext(std::string *infoLog,
     return new WorkerContextGbm(context, mEGL);
 }
 
+EGLint DisplayGbm::fixSurfaceType(EGLint surfaceType) const
+{
+    EGLint type = DisplayEGL::fixSurfaceType(surfaceType);
+    // Ozone native surfaces don't support EGL_WINDOW_BIT,
+    // but ANGLE uses renderbuffers to emulate windows
+    return type | EGL_WINDOW_BIT;
+}
+
 }  // namespace rx

src/libANGLE/renderer/gl/egl/gbm/DisplayGbm.h

@@ -136,6 +136,7 @@ class DisplayGbm final : public DisplayEGL
 
   private:
     void generateExtensions(egl::DisplayExtensions *outExtensions) const override;
+    EGLint fixSurfaceType(EGLint surfaceType) const override;
 
     GLuint makeShader(GLuint type, const char *src);
     void drawBuffer(const gl::Context *context, Buffer *buffer);