diff options
| author | David Yen <dyen@chromium.org> | 2016-01-29 11:43:14 -0800 |
|---|---|---|
| committer | David Yen <dyen@chromium.org> | 2016-01-29 19:44:46 +0000 |
| commit | 5b1b9e65d6844bb74412d9cf0f03d6ccaf859931 (patch) | |
| tree | f8e7330cb16230020cb8c83ad9e509e59318bf29 | |
| parent | bdd68bdfe86a53e991c653332578ea4205615bf0 (diff) | |
| download | chromium_src-5b1b9e65d6844bb74412d9cf0f03d6ccaf859931.zip chromium_src-5b1b9e65d6844bb74412d9cf0f03d6ccaf859931.tar.gz chromium_src-5b1b9e65d6844bb74412d9cf0f03d6ccaf859931.tar.bz2 | |
Make sure Ppapi compositor layer resources are synchronized.
BUG=514815, 581951
Review URL: https://codereview.chromium.org/1641323002
Cr-Commit-Position: refs/heads/master@{#372232}
(cherry picked from commit 549080a113a0756a35d760d56ff52873e1739c92)
Review URL: https://codereview.chromium.org/1650643002 .
Cr-Commit-Position: refs/branch-heads/2623@{#198}
Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}
| -rw-r--r-- | ppapi/proxy/compositor_layer_resource.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ppapi/proxy/compositor_layer_resource.cc b/ppapi/proxy/compositor_layer_resource.cc index fc88f6a..d842a36 100644 --- a/ppapi/proxy/compositor_layer_resource.cc +++ b/ppapi/proxy/compositor_layer_resource.cc @@ -178,9 +178,8 @@ int32_t CompositorLayerResource::SetTexture( data_.texture->source_rect.size = source_size_; const GLuint64 fence_sync = gl->InsertFenceSyncCHROMIUM(); - gl->OrderingBarrierCHROMIUM(); - gl->GenUnverifiedSyncTokenCHROMIUM(fence_sync, - data_.texture->sync_token.GetData()); + gl->ShallowFlushCHROMIUM(); + gl->GenSyncTokenCHROMIUM(fence_sync, data_.texture->sync_token.GetData()); // If the PP_Resource of this layer is released by the plugin, the // release_callback will be aborted immediately, but the texture or image |