Revert "Refactor DisplayGbm::generateConfigs"

This reverts commit 7d82d293. Reason for revert: Suspect CL failing on Linux FYI Ozone Original change's description: > Refactor DisplayGbm::generateConfigs > > Bug: angleproject:4809 > Change-Id: I5f352f737bbd53c78d9e01055c17eabd17d5fb8a > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2278667 > Reviewed-by: Jamie Madill <jmadill@chromium.org> > Reviewed-by: Geoff Lang <geofflang@chromium.org> > Commit-Queue: Jiajia Qin <jiajia.qin@intel.com> TBR=geofflang@chromium.org,jiajia.qin@intel.com,jmadill@chromium.org Change-Id: I62c8a6a78d1ccfe8aa63bea7a9409229cd0059ab No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: angleproject:4809, chromium:1105208 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2296041 Commit-Queue: Austin Eng <enga@chromium.org> Reviewed-by: Austin Eng <enga@chromium.org>

Revert "Refactor DisplayGbm::generateConfigs"
66d85686 · Austin Eng · Commit Bot · e5c18475 · 66d85686
Commit 66d85686 authored Jul 13, 2020 by Austin Eng Committed by Commit Bot Jul 13, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 30 deletions

DisplayGbm.cpp src/libANGLE/renderer/gl/egl/gbm/DisplayGbm.cpp +18 -30

No files found.
--- a/src/libANGLE/renderer/gl/egl/gbm/DisplayGbm.cpp
+++ b/src/libANGLE/renderer/gl/egl/gbm/DisplayGbm.cpp
@@ -924,36 +924,24 @@ egl::Error DisplayGbm::makeCurrent(egl::Surface *drawSurface,
 egl::ConfigSet DisplayGbm::generateConfigs()
 {
+    egl::ConfigSet configs;
-    gl::Version eglVersion(mEGL->majorVersion, mEGL->minorVersion);
-    ASSERT(eglVersion >= gl::Version(1, 4));
+    egl::Config config;
+    config.bufferSize         = 32;
-    bool supportES3 =
+    config.redSize            = 8;
-        (eglVersion >= gl::Version(1, 5) || mEGL->hasExtension("EGL_KHR_create_context")) &&
+    config.greenSize          = 8;
-        (mRenderer->getMaxSupportedESVersion() >= gl::Version(3, 0));
+    config.blueSize           = 8;
-    EGLint renderType = EGL_OPENGL_ES2_BIT | (supportES3 ? EGL_OPENGL_ES3_BIT : 0);
+    config.alphaSize          = 8;
+    config.depthSize          = 24;
-    // clang-format off
+    config.stencilSize        = 8;
-    std::vector<EGLint> configAttribs8888 =
+    config.bindToTextureRGBA  = EGL_TRUE;
-    {
+    config.renderableType     = EGL_OPENGL_ES2_BIT;
-        EGL_COLOR_BUFFER_TYPE, EGL_RGB_BUFFER,
+    config.surfaceType        = EGL_WINDOW_BIT | EGL_PBUFFER_BIT;
-        // CrOS doesn't support window and pixmaps?
+    config.renderTargetFormat = GL_RGBA8;
-        EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
+    config.depthStencilFormat = GL_DEPTH24_STENCIL8;
-        EGL_CONFIG_CAVEAT, EGL_NONE,
-        EGL_CONFORMANT, renderType,
+    configs.add(config);
-        EGL_RENDERABLE_TYPE, renderType,
+    return configs;
-        EGL_RED_SIZE, 8,
-        EGL_GREEN_SIZE, 8,
-        EGL_BLUE_SIZE, 8,
-        EGL_ALPHA_SIZE, 8,
-        EGL_BUFFER_SIZE, 32,
-        EGL_DEPTH_SIZE, 24,
-        EGL_NONE
-    };
-    // clang-format on
-    mConfigAttribList = configAttribs8888;
-    return DisplayEGL::generateConfigs();
 }
 bool DisplayGbm::isValidNativeWindow(EGLNativeWindowType window) const