Log serious OpenGL errors in remote CoreAnimation

content/common/gpu/image_transport_surface_calayer_mac.mm

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/image_transport_surface_calayer_mac.h"
 
 #include <OpenGL/CGLRenderers.h>
 
 #include "base/command_line.h"
 #include "base/mac/sdk_forward_declarations.h"
@@ skipping 37 matching lines @@
       storageProvider_->LayerShareGroupContext()));
 }
 
 - (CGLContextObj)copyCGLContextForPixelFormat:(CGLPixelFormatObj)pixelFormat {
   if (!storageProvider_)
     return NULL;
   CGLContextObj context = NULL;
   CGLError error = CGLCreateContext(
       pixelFormat, storageProvider_->LayerShareGroupContext(), &context);
   if (error != kCGLNoError)
-    DLOG(ERROR) << "CGLCreateContext failed with CGL error: " << error;
+    LOG(ERROR) << "CGLCreateContext failed with CGL error: " << error;
   return context;
 }
 
 - (BOOL)canDrawInCGLContext:(CGLContextObj)glContext
                 pixelFormat:(CGLPixelFormatObj)pixelFormat
                forLayerTime:(CFTimeInterval)timeInterval
                 displayTime:(const CVTimeStamp*)timeStamp {
   if (!storageProvider_)
     return NO;
   return storageProvider_->LayerCanDraw();
@@ skipping 45 matching lines @@
 gfx::Size CALayerStorageProvider::GetRoundedSize(gfx::Size size) {
   return size;
 }
 
 bool CALayerStorageProvider::AllocateColorBufferStorage(
     CGLContextObj context, GLuint texture,
     gfx::Size pixel_size, float scale_factor) {
   // Allocate an ordinary OpenGL texture to back the FBO.
   GLenum error;
   while ((error = glGetError()) != GL_NO_ERROR) {
-    DLOG(ERROR) << "Error found (and ignored) before allocating buffer "
-                << "storage: " << error;
+    LOG(ERROR) << "OpenGL error hit but ignored before allocating buffer "
+               << "storage: " << error;
   }
   glTexImage2D(GL_TEXTURE_RECTANGLE_ARB,
                0,
                GL_RGBA,
                pixel_size.width(),
                pixel_size.height(),
                0,
                GL_RGBA,
                GL_UNSIGNED_BYTE,
                NULL);
-  error = glGetError();
-  if (error != GL_NO_ERROR) {
-    DLOG(ERROR) << "glTexImage failed with GL error: " << error;
+  glFlush();
+
+  bool hit_error = false;
+  while ((error = glGetError()) != GL_NO_ERROR) {
+    LOG(ERROR) << "OpenGL error hit while trying to allocate buffer storage: "
+               << error;
+    hit_error = true;
+  }
+  if (hit_error)
     return false;
-  }
-  glFlush();
 
   // Set the parameters that will be used to allocate the CALayer to draw the
   // texture into.
   share_group_context_.reset(CGLRetainContext(context));
   fbo_texture_ = texture;
   fbo_pixel_size_ = pixel_size;
   fbo_scale_factor_ = scale_factor;
   return true;
 }
 
@@ skipping 184 matching lines @@
   glDisable(GL_TEXTURE_RECTANGLE_ARB);
 
   GLint current_renderer_id = 0;
   if (CGLGetParameter(CGLGetCurrentContext(),
                       kCGLCPCurrentRendererID,
                       &current_renderer_id) == kCGLNoError) {
     current_renderer_id &= kCGLRendererIDMatchingMask;
     transport_surface_->SetRendererID(current_renderer_id);
   }
 
+  GLenum error;
+  while ((error = glGetError()) != GL_NO_ERROR) {
+    LOG(ERROR) << "OpenGL error hit while drawing frame: " << error;
+  }
+
   // Allow forward progress in the context now that the swap is complete.
   UnblockBrowserIfNeeded();
 }
 
 void CALayerStorageProvider::LayerResetStorageProvider() {
   // If we are providing back-pressure by waiting for a draw, that draw will
   // now never come, so release the pressure now.
   UnblockBrowserIfNeeded();
 }
 
 void CALayerStorageProvider::OnGpuSwitched() {
   recreate_layer_after_gpu_switch_ = true;
 }
 
 void CALayerStorageProvider::UnblockBrowserIfNeeded() {
   if (!has_pending_draw_)
     return;
   pending_draw_weak_factory_.InvalidateWeakPtrs();
   has_pending_draw_ = false;
   transport_surface_->SendSwapBuffers(
       ui::SurfaceHandleFromCAContextID([context_ contextId]),
       fbo_pixel_size_,
       fbo_scale_factor_);
 }
 
 }  //  namespace content