Revert "Fix two issues with GLES2 devices"

This reverts commit c0ed204d. Reason for revert: crbug.com/1186140 Original change's description: > Fix two issues with GLES2 devices > > * make sure maxColorAttachments is greater than 0 > * Do not sync read buffer if maxDrawBuffers is 0 > > Bug: chromium:1167731 > Change-Id: Icd0fb5e65ec6ffdc0d6f6325ccd1207958922254 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2733268 > Reviewed-by: Geoff Lang <geofflang@chromium.org> > Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> > Commit-Queue: Peng Huang <penghuang@chromium.org> Bug: chromium:1167731 Change-Id: Ibd05424889feac0bdb7293426ab41eb1f4753b35 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2743662 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Peng Huang <penghuang@chromium.org>

Revert "Fix two issues with GLES2 devices"
02a9d011 · Peng Huang · Commit Bot · f34a788b · 02a9d011 · 02a9d011
Commit 02a9d011 authored Mar 09, 2021 by Peng Huang Committed by Commit Bot Mar 09, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 10 deletions

Framebuffer.cpp src/libANGLE/Framebuffer.cpp +1 -4

renderergl_utils.cpp src/libANGLE/renderer/gl/renderergl_utils.cpp +1 -6

No files found.
--- a/src/libANGLE/Framebuffer.cpp
+++ b/src/libANGLE/Framebuffer.cpp
@@ -707,10 +707,7 @@ Framebuffer::Framebuffer(const Caps &caps,
    {
        mDirtyColorAttachmentBindings.emplace_back(this, DIRTY_BIT_COLOR_ATTACHMENT_0 + colorIndex);
    }
-    if (caps.maxDrawBuffers > 1)
+    mDirtyBits.set(DIRTY_BIT_READ_BUFFER);
-    {
-        mDirtyBits.set(DIRTY_BIT_READ_BUFFER);
-    }
 }
 Framebuffer::Framebuffer(const Context *context, egl::Surface *surface, egl::Surface *readSurface)

--- a/src/libANGLE/renderer/gl/renderergl_utils.cpp
+++ b/src/libANGLE/renderer/gl/renderergl_utils.cpp
@@ -660,16 +660,11 @@ void GenerateCaps(const FunctionsGL *functions,
    if (functions->isAtLeastGL(gl::Version(3, 0)) ||
        functions->hasGLExtension("GL_EXT_framebuffer_object") ||
-        functions->isAtLeastGLES(gl::Version(3, 0)))
+        functions->isAtLeastGLES(gl::Version(2, 0)))
    {
        caps->maxRenderbufferSize = QuerySingleGLInt(functions, GL_MAX_RENDERBUFFER_SIZE);
        caps->maxColorAttachments = QuerySingleGLInt(functions, GL_MAX_COLOR_ATTACHMENTS);
    }
-    else if (functions->isAtLeastGLES(gl::Version(2, 0)))
-    {
-        caps->maxRenderbufferSize = QuerySingleGLInt(functions, GL_MAX_RENDERBUFFER_SIZE);
-        caps->maxColorAttachments = 1;
-    }
    else
    {
        // Can't support ES2 without framebuffers and renderbuffers