third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.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/gpu/DrawingBuffer.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/ImageBuffer.cpp ('k') | third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp

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

index 43952c5dd8961da343bc8312b916dd6406ee0a1c..e74cfa5de720fe1c96b4c6883f7d0b50aa17eeb7 100644

--- a/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp

+++ b/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp

@@ -308,7 +308,8 @@ bool DrawingBuffer::prepareMailbox(WebExternalTextureMailbox* outMailbox, WebExt

m_gl->ProduceTextureDirectCHROMIUM(frontColorBufferMailbox->textureInfo.textureId, frontColorBufferMailbox->textureInfo.parameters.target, frontColorBufferMailbox->mailbox.name);

const GLuint64 fenceSync = m_gl->InsertFenceSyncCHROMIUM();

m_gl->Flush();

- frontColorBufferMailbox->mailbox.validSyncToken = m_context->genSyncTokenCHROMIUM(fenceSync, frontColorBufferMailbox->mailbox.syncToken);

+ m_gl->GenSyncTokenCHROMIUM(fenceSync, frontColorBufferMailbox->mailbox.syncToken);

+ frontColorBufferMailbox->mailbox.validSyncToken = true;

frontColorBufferMailbox->mailbox.allowOverlay = frontColorBufferMailbox->textureInfo.imageId != 0;

frontColorBufferMailbox->mailbox.textureTarget = frontColorBufferMailbox->textureInfo.parameters.target;

frontColorBufferMailbox->mailbox.textureSize = WebSize(m_size.width(), m_size.height());

@@ -532,7 +533,8 @@ bool DrawingBuffer::copyToPlatformTexture(WebGraphicsContext3D* context, gpu::gl

m_gl->ProduceTextureDirectCHROMIUM(textureId, target, mailbox.name);

const GLuint64 fenceSync = m_gl->InsertFenceSyncCHROMIUM();

m_gl->Flush();

- mailbox.validSyncToken = m_context->genSyncTokenCHROMIUM(fenceSync, mailbox.syncToken);

+ m_gl->GenSyncTokenCHROMIUM(fenceSync, mailbox.syncToken);

+ mailbox.validSyncToken = true;

}

if (mailbox.validSyncToken)

@@ -554,8 +556,8 @@ bool DrawingBuffer::copyToPlatformTexture(WebGraphicsContext3D* context, gpu::gl

gl->Flush();

GLbyte syncToken[24];

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

- m_gl->WaitSyncTokenCHROMIUM(syncToken);

+ gl->GenSyncTokenCHROMIUM(fenceSync, syncToken);

+ m_gl->WaitSyncTokenCHROMIUM(syncToken);

return true;

}