Chromium Code Reviews| 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 2b3757b7cc09dd9f17ca392ef1fc691fa5cc17ef..e42dcf26a60fcb408d8f847a5e4e5302cc32c9e6 100644 |
| --- a/gpu/command_buffer/service/program_manager.cc |
| +++ b/gpu/command_buffer/service/program_manager.cc |
| @@ -482,7 +482,7 @@ void Program::UpdateLogInfo() { |
| GLint max_len = 0; |
| glGetProgramiv(service_id_, GL_INFO_LOG_LENGTH, &max_len); |
| if (max_len == 0) { |
| - set_log_info(NULL); |
| + set_log_info(nullptr); |
| return; |
| } |
| std::unique_ptr<char[]> temp(new char[max_len]); |
| @@ -491,7 +491,8 @@ void Program::UpdateLogInfo() { |
| DCHECK(max_len == 0 || len < max_len); |
| DCHECK(len == 0 || temp[len] == '\0'); |
| std::string log(temp.get(), len); |
| - set_log_info(ProcessLogInfo(log).c_str()); |
| + log = ProcessLogInfo(log); |
| + set_log_info(log.length() ? log.c_str() : nullptr); |
|
Zhenyao Mo
2016/08/08 16:36:15
log.empty() is better
qiankun
2016/08/08 23:31:02
Done.
|
| } |
| void Program::ClearUniforms(std::vector<uint8_t>* zero_buffer) { |