Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(158)

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder.cc

Issue 12213073: Re-land: Mark async texture uploads as completed from the upload thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Avoid unnecessary polling by GpuCommandBufferStub. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 3b441a2c76688e8432d3569c147e9dda7a60b69e..0ac835be0c8c3fe9548f8d61d9873a60d6eb37ef 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -2719,6 +2719,9 @@ bool GLES2DecoderImpl::MakeCurrent() {
return false;
}
+ if (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.
@@ -9116,6 +9119,8 @@ error::Error GLES2DecoderImpl::HandleEndQueryEXT(
return error::kOutOfBounds;
}
+ query_manager_->ProcessPendingTransferQueries();
+
state_.current_query = NULL;
return error::kNoError;
}

Powered by Google App Engine
This is Rietveld 408576698