cc: Always log shader compiler errors

cc/output/program_binding.cc

 // Copyright 2011 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 "cc/output/program_binding.h"
 
 #include "base/trace_event/trace_event.h"
 #include "cc/output/geometry_binding.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
@@ skipping 159 matching lines @@
     context->DeleteShader(vertex_shader_id_);
     vertex_shader_id_ = 0;
     return false;
   }
 
   program_ =
       CreateShaderProgram(context, vertex_shader_id_, fragment_shader_id_);
   return !!program_;
 }
 
-bool ProgramBindingBase::Link(GLES2Interface* context) {
+bool ProgramBindingBase::Link(GLES2Interface* context,
+                              const std::string& vertex_source,
+                              const std::string& fragment_source) {
   context->LinkProgram(program_);
   CleanupShaders(context);
   if (!program_)
     return false;
-#ifndef NDEBUG
   int linked = 0;
   context->GetProgramiv(program_, GL_LINK_STATUS, &linked);
   if (!linked) {
     char buffer[1024] = "";
     context->GetProgramInfoLog(program_, sizeof(buffer), nullptr, buffer);
-    DLOG(ERROR) << "Error compiling shader: " << buffer;
+    LOG(ERROR) << "Error linking shader: " << buffer << "\n"
+               << "Vertex shader:\n"
+               << vertex_source << "Fragment shader:\n"
+               << fragment_source;
     return false;
   }
-#endif
   return true;
 }
 
 void ProgramBindingBase::Cleanup(GLES2Interface* context) {
   initialized_ = false;
   if (!program_)
     return;
 
   DCHECK(context);
   context->DeleteProgram(program_);
   program_ = 0;
 
   CleanupShaders(context);
 }
 
 unsigned ProgramBindingBase::LoadShader(GLES2Interface* context,
                                         unsigned type,
                                         const std::string& shader_source) {
   unsigned shader = context->CreateShader(type);
   if (!shader)
     return 0u;
 
   const char* shader_source_str[] = { shader_source.data() };
   int shader_length[] = { static_cast<int>(shader_source.length()) };
   context->ShaderSource(
       shader, 1,
       shader_source_str,
       shader_length);
   context->CompileShader(shader);
-#if DCHECK_IS_ON()
   int compiled = 0;
   context->GetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
   if (!compiled) {
     char buffer[1024] = "";
     context->GetShaderInfoLog(shader, sizeof(buffer), nullptr, buffer);
-    DLOG(ERROR) << "Error compiling shader: " << buffer
-                << "\n shader program: " << shader_source;
+    LOG(ERROR) << "Error compiling shader: " << buffer << "\n"
+               << "Shader program:\n"
+               << shader_source;
     return 0u;
   }
-#endif
   return shader;
 }
 
 unsigned ProgramBindingBase::CreateShaderProgram(GLES2Interface* context,
                                                  unsigned vertex_shader,
                                                  unsigned fragment_shader) {
   unsigned program_object = context->CreateProgram();
   if (!program_object)
     return 0;
 
@@ skipping 21 matching lines @@
     context->DeleteShader(fragment_shader_id_);
     fragment_shader_id_ = 0;
   }
 }
 
 bool ProgramBindingBase::IsContextLost(GLES2Interface* context) {
   return context->GetGraphicsResetStatusKHR() != GL_NO_ERROR;
 }
 
 }  // namespace cc