third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp - Issue 1812363002: Remove genSyncTokenCHROMIUM from WebGraphicsContext3D.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp

Issue 1812363002: Remove genSyncTokenCHROMIUM from WebGraphicsContext3D. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@simples-tplus

Patch Set: gensynctoken: rebase Created 4 years, 9 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

« no previous file with comments | « third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp ('k') | third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp b/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp

index 134dfe432a62c3317cc7c80557c4268ffb8b319c..6d81dc80039558c85962f842566ab745f8ff9e36 100644

--- a/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp

+++ b/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp

@@ -203,7 +203,6 @@ bool ImageBuffer::copyToPlatformTexture(WebGraphicsContext3D* context, gpu::gles

OwnPtr<WebGraphicsContext3DProvider> provider = adoptPtr(Platform::current()->createSharedOffscreenGraphicsContext3DProvider());

if (!provider)

return false;

- WebGraphicsContext3D* sharedContext = provider->context3d();

gpu::gles2::GLES2Interface* sharedGL = provider->contextGL();

OwnPtr<WebExternalTextureMailbox> mailbox = adoptPtr(new WebExternalTextureMailbox);

@@ -215,9 +214,9 @@ bool ImageBuffer::copyToPlatformTexture(WebGraphicsContext3D* context, gpu::gles

const GLuint64 sharedFenceSync = sharedGL->InsertFenceSyncCHROMIUM();

sharedGL->Flush();

- mailbox->validSyncToken = sharedContext->genSyncTokenCHROMIUM(sharedFenceSync, mailbox->syncToken);

- if (mailbox->validSyncToken)

- gl->WaitSyncTokenCHROMIUM(mailbox->syncToken);

+ sharedGL->GenSyncTokenCHROMIUM(sharedFenceSync, mailbox->syncToken);

+ mailbox->validSyncToken = true;

+ gl->WaitSyncTokenCHROMIUM(mailbox->syncToken);

Platform3DObject sourceTexture = gl->CreateAndConsumeTextureCHROMIUM(textureInfo->fTarget, mailbox->name);

@@ -232,8 +231,8 @@ bool ImageBuffer::copyToPlatformTexture(WebGraphicsContext3D* context, gpu::gles

gl->Flush();

WGC3Dbyte syncToken[24];

- if (context->genSyncTokenCHROMIUM(contextFenceSync, syncToken))

- sharedGL->WaitSyncTokenCHROMIUM(syncToken);

+ gl->GenSyncTokenCHROMIUM(contextFenceSync, syncToken);

+ sharedGL->WaitSyncTokenCHROMIUM(syncToken);

// Undo grContext texture binding changes introduced in this function

provider->grContext()->resetContext(kTextureBinding_GrGLBackendState);