Re-land: Mark async texture uploads as completed from the upload thread.

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2012 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 "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 2707 matching lines @@
 
 bool GLES2DecoderImpl::MakeCurrent() {
   if (!context_.get() || !context_->MakeCurrent(surface_.get()))
     return false;
 
   if (WasContextLost()) {
     LOG(ERROR) << "  GLES2DecoderImpl: Context lost during MakeCurrent.";
     return false;
   }
 
+  if (engine() && query_manager_.get())
+    query_manager_->ProcessPendingTransferQueries();
+
   // TODO(epenner): Is there a better place to do this? Transfers
   // can complete any time we yield the main thread. So we *must*
   // process transfers after any such yield, before resuming.
   bool frame_buffer_dirty = false;
   bool texture_dirty = false;
   texture_manager()->BindFinishedAsyncPixelTransfers(
       &texture_dirty, &frame_buffer_dirty);
   // Texture unit zero might be stomped.
   if (texture_dirty)
     RestoreCurrentTexture2DBindings();
@@ skipping 6377 matching lines @@
   if (state_.current_query->target() != target) {
     SetGLError(GL_INVALID_OPERATION,
                "glEndQueryEXT", "target does not match active query");
     return error::kNoError;
   }
 
   if (!query_manager_->EndQuery(state_.current_query, submit_count)) {
     return error::kOutOfBounds;
   }
 
+  query_manager_->ProcessPendingTransferQueries();
+
   state_.current_query = NULL;
   return error::kNoError;
 }
 
 bool GLES2DecoderImpl::GenVertexArraysOESHelper(
     GLsizei n, const GLuint* client_ids) {
   for (GLsizei ii = 0; ii < n; ++ii) {
     if (GetVertexAttribManager(client_ids[ii])) {
       return false;
     }
@@ skipping 948 matching lines @@
   return error::kNoError;
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu