Index: gpu/command_buffer/service/program_manager.cc |
diff --git a/gpu/command_buffer/service/program_manager.cc b/gpu/command_buffer/service/program_manager.cc |
index b109be947696aa4e88461ba1801bd97a049adc0c..d2513654fa65d3a281e73245e309685709db9177 100644 |
--- a/gpu/command_buffer/service/program_manager.cc |
+++ b/gpu/command_buffer/service/program_manager.cc |
@@ -439,8 +439,6 @@ void ProgramManager::ForceCompileShader(const std::string* source, |
// We cannot reach here if we are using the shader translator. |
// All invalid shaders must be rejected by the translator. |
// All translated shaders must compile. |
alokp
2012/07/31 23:04:56
Could you append "unless the driver is buggy" to t
|
- LOG_IF(ERROR, translator) |
- << "Shader translator allowed/produced an invalid shader."; |
GLint max_len = 0; |
glGetShaderiv(info->service_id(), GL_INFO_LOG_LENGTH, &max_len); |
scoped_array<char> temp(new char[max_len]); |
@@ -449,6 +447,11 @@ void ProgramManager::ForceCompileShader(const std::string* source, |
DCHECK(max_len == 0 || len < max_len); |
DCHECK(len == 0 || temp[len] == '\0'); |
info->SetStatus(false, std::string(temp.get(), len).c_str(), NULL); |
+ LOG_IF(ERROR, translator) |
+ << "Shader translator allowed/produced an invalid shader:" |
+ << "\n--original-shader--\n" << (source ? *source : "") |
+ << "\n--translated-shader--\n" << shader_src |
+ << "\n--info-log--\n" << *info->log_info(); |
} |
} |