Commit 03a8bf36 authored by Peng Huang's avatar Peng Huang Committed by Commit Bot

PresentationCallback: Fix a crash related with passthrough cmd buffer.


Bug: 776877
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I4135777822e41a928906e5d42308afd36f8ee40f
Reviewed-on: https://chromium-review.googlesource.com/1044290
Commit-Queue: Peng Huang <penghuang@chromium.org>
Reviewed-by: default avatarAntoine Labour <piman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556171}
parent 299b84f8
...@@ -3256,6 +3256,7 @@ error::Error GLES2DecoderPassthroughImpl::DoSwapBuffers(GLbitfield flags) { ...@@ -3256,6 +3256,7 @@ error::Error GLES2DecoderPassthroughImpl::DoSwapBuffers(GLbitfield flags) {
return error::kNoError; return error::kNoError;
} }
client_->OnSwapBuffers(flags);
return CheckSwapBuffersResult(surface_->SwapBuffers(base::DoNothing()), return CheckSwapBuffersResult(surface_->SwapBuffers(base::DoNothing()),
"SwapBuffers"); "SwapBuffers");
} }
...@@ -3839,6 +3840,7 @@ error::Error GLES2DecoderPassthroughImpl::DoSwapBuffersWithBoundsCHROMIUM( ...@@ -3839,6 +3840,7 @@ error::Error GLES2DecoderPassthroughImpl::DoSwapBuffersWithBoundsCHROMIUM(
rects[i * 4 + 3]); rects[i * 4 + 3]);
} }
client_->OnSwapBuffers(flags);
return CheckSwapBuffersResult( return CheckSwapBuffersResult(
surface_->SwapBuffersWithBounds(bounds, base::DoNothing()), surface_->SwapBuffersWithBounds(bounds, base::DoNothing()),
"SwapBuffersWithBounds"); "SwapBuffersWithBounds");
...@@ -3858,6 +3860,7 @@ error::Error GLES2DecoderPassthroughImpl::DoPostSubBufferCHROMIUM( ...@@ -3858,6 +3860,7 @@ error::Error GLES2DecoderPassthroughImpl::DoPostSubBufferCHROMIUM(
dc_layer_shared_state_.reset(); dc_layer_shared_state_.reset();
client_->OnSwapBuffers(flags);
return CheckSwapBuffersResult( return CheckSwapBuffersResult(
surface_->PostSubBuffer(x, y, width, height, base::DoNothing()), surface_->PostSubBuffer(x, y, width, height, base::DoNothing()),
"PostSubBuffer"); "PostSubBuffer");
...@@ -4274,6 +4277,7 @@ error::Error GLES2DecoderPassthroughImpl::DoCommitOverlayPlanesCHROMIUM( ...@@ -4274,6 +4277,7 @@ error::Error GLES2DecoderPassthroughImpl::DoCommitOverlayPlanesCHROMIUM(
dc_layer_shared_state_.reset(); dc_layer_shared_state_.reset();
client_->OnSwapBuffers(flags);
return CheckSwapBuffersResult( return CheckSwapBuffersResult(
surface_->CommitOverlayPlanes(base::DoNothing()), "CommitOverlayPlanes"); surface_->CommitOverlayPlanes(base::DoNothing()), "CommitOverlayPlanes");
} }
......
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