Chromium Code Reviews| Index: gpu/command_buffer/client/gles2_implementation.cc |
| diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc |
| index e0b0cb82f60b36b2a9e5f3f39217aaec0112f9d4..37f433af0e0fdcb80f1686c5532914c929cb256e 100644 |
| --- a/gpu/command_buffer/client/gles2_implementation.cc |
| +++ b/gpu/command_buffer/client/gles2_implementation.cc |
| @@ -3285,7 +3285,16 @@ void GLES2Implementation::BeginQueryEXT(GLenum target, GLuint id) { |
| if (!query) { |
| query = query_tracker_->CreateQuery(id, target); |
| if (!query) { |
| - MustBeContextLost(); |
|
piman
2014/03/14 00:45:57
I think that was the last caller. Can you remove M
danakj
2014/03/14 01:15:49
Oh! Done.
|
| + bool context_lost = helper_->IsContextLost(); |
| + if (!context_lost) { |
| + WaitForCmd(); |
| + context_lost = helper_->IsContextLost(); |
| + } |
| + if (!context_lost) { |
| + SetGLError(GL_OUT_OF_MEMORY, |
| + "BeginQueryEXT", |
| + "Transfer buffer allocation failed."); |
| + } |
| return; |
| } |
| } else if (query->target() != target) { |