Reland "Fix two issues with GLES2 devices"

This is a reland of c0ed204d 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: Iccd7b0986c4728e362fccaeda6fbeff2860d888c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2743665Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Peng Huang <penghuang@chromium.org>

Reland "Fix two issues with GLES2 devices"
7ee24229 · Peng Huang · Commit Bot · b27740f3 · 7ee24229 · 7ee24229
Commit 7ee24229 authored Mar 03, 2021 by Peng Huang Committed by Commit Bot Mar 09, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

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

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

No files found.
--- a/src/libANGLE/Framebuffer.cpp
+++ b/src/libANGLE/Framebuffer.cpp
@@ -705,7 +705,10 @@ Framebuffer::Framebuffer(const Caps &caps,
    {
        mDirtyColorAttachmentBindings.emplace_back(this, DIRTY_BIT_COLOR_ATTACHMENT_0 + colorIndex);
    }
-    mDirtyBits.set(DIRTY_BIT_READ_BUFFER);
+    if (caps.maxDrawBuffers > 1)
+    {
+        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,11 +660,16 @@ void GenerateCaps(const FunctionsGL *functions,
    if (functions->isAtLeastGL(gl::Version(3, 0)) ||
        functions->hasGLExtension("GL_EXT_framebuffer_object") ||
-        functions->isAtLeastGLES(gl::Version(2, 0)))
+        functions->isAtLeastGLES(gl::Version(3, 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