Commit d2c8d8c4 authored by Geoff Lang's avatar Geoff Lang Committed by Commit Bot

Report GPU watchdog progress before and after glFinish.

glFinish has a fairly high chance of triggering the watchdog, make sure
it gets the most time possible by reporting progress before and after
calling glFinish.

Bug: chromium:1014259
Change-Id: I110ab8499b0d480a1f96e385093e044e8484cd57
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2436951Reviewed-by: default avatarZhenyao Mo <zmo@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812738}
parent 46c21f03
......@@ -1289,8 +1289,14 @@ error::Error GLES2DecoderPassthroughImpl::DoFenceSync(GLenum condition,
}
error::Error GLES2DecoderPassthroughImpl::DoFinish() {
// Finish can take a long time, make sure the watchdog gives it the most
// amount of time to complete.
group_->ReportProgress();
api()->glFinishFn();
group_->ReportProgress();
error::Error error = ProcessReadPixels(true);
if (error != error::kNoError) {
return error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment