Comments and conditional.

jonahwilliams · jonahwilliams · commit 82c0fce4d901 · 2024-11-19T11:10:50.000-08:00
diff --git a/impeller/renderer/backend/gles/capabilities_gles.cc b/impeller/renderer/backend/gles/capabilities_gles.cc
@@ -125,11 +125,11 @@ CapabilitiesGLES::CapabilitiesGLES(const ProcTableGLES& gl) {
 
     // We hard-code 4x MSAA, so let's make sure it's supported.
     GLint value = 0;
-    gl.GetIntegerv(GL_MAX_SAMPLES_EXT, &value);
+    gl.GetIntegerv(GL_MAX_SAMPLES, &value);
     supports_offscreen_msaa_ = value >= 4;
   } else if (desc->GetGlVersion().major_version >= 3 && desc->IsES()) {
     GLint value = 0;
-    gl.GetIntegerv(GL_MAX_SAMPLES_EXT, &value);
+    gl.GetIntegerv(GL_MAX_SAMPLES, &value);
     supports_offscreen_msaa_ = value >= 4;
   }
   is_es_ = desc->IsES();
diff --git a/impeller/renderer/backend/gles/render_pass_gles.cc b/impeller/renderer/backend/gles/render_pass_gles.cc
@@ -532,10 +532,11 @@ void RenderPassGLES::ResetGLState(const ProcTableGLES& gl) {
     gl.BindFramebuffer(GL_DRAW_FRAMEBUFFER, GL_NONE);
     gl.BindFramebuffer(GL_READ_FRAMEBUFFER, GL_NONE);
     gl.DeleteFramebuffers(1u, &resolve_fbo);
+    // Rebind the original FBO so that we can discard it below.
+    gl.BindFramebuffer(GL_FRAMEBUFFER, fbo);
   }
 
   if (gl.DiscardFramebufferEXT.IsAvailable()) {
-    gl.BindFramebuffer(GL_FRAMEBUFFER, fbo);
     std::vector<GLenum> attachments;
 
     // TODO(130048): discarding stencil or depth on the default fbo causes Angle
diff --git a/impeller/renderer/backend/gles/texture_gles.cc b/impeller/renderer/backend/gles/texture_gles.cc
@@ -457,27 +457,27 @@ void TextureGLES::InitializeContentsIfNecessary() const {
           // with regular GLES 3.0 multisampled renderbuffers/textures.
           if (gl.GetCapabilities()->SupportsImplicitResolvingMSAA()) {
             gl.RenderbufferStorageMultisampleEXT(
-                GL_RENDERBUFFER,               // target
-                4,                             // samples
-                render_buffer_format.value(),  // internal format
-                size.width,                    // width
-                size.height                    // height
+                /*target=*/GL_RENDERBUFFER,                        //
+                /*samples=*/4,                                     //
+                /*internal_format=*/render_buffer_format.value(),  //
+                /*width=*/size.width,                              //
+                /*height=*/size.height                             //
             );
           } else {
             gl.RenderbufferStorageMultisample(
-                GL_RENDERBUFFER,               // target
-                4,                             // samples
-                render_buffer_format.value(),  // internal format
-                size.width,                    // width
-                size.height                    // height
+                /*target=*/GL_RENDERBUFFER,                        //
+                /*samples=*/4,                                     //
+                /*internal_format=*/render_buffer_format.value(),  //
+                /*width=*/size.width,                              //
+                /*height=*/size.height                             //
             );
           }
         } else {
           gl.RenderbufferStorage(
-              GL_RENDERBUFFER,               // target
-              render_buffer_format.value(),  // internal format
-              size.width,                    // width
-              size.height                    // height
+              /*target=*/GL_RENDERBUFFER,                        //
+              /*internal_format=*/render_buffer_format.value(),  //
+              /*width=*/size.width,                              //
+              /*height=*/size.height                             //
           );
         }
       }
