Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2301)

Unified Diff: Source/platform/graphics/gpu/DrawingBuffer.cpp

Issue 179973004: Share Group plumbing in Blink; Remove WebGL from default share group (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Changed nullptr to 0 Created 6 years, 10 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
Index: Source/platform/graphics/gpu/DrawingBuffer.cpp
diff --git a/Source/platform/graphics/gpu/DrawingBuffer.cpp b/Source/platform/graphics/gpu/DrawingBuffer.cpp
index 1478ff8fcd888762da886c401ba65ab1b2823ffc..faebf82dd1c52284a32919ce0de067e422307773 100644
--- a/Source/platform/graphics/gpu/DrawingBuffer.cpp
+++ b/Source/platform/graphics/gpu/DrawingBuffer.cpp
@@ -329,14 +329,34 @@ bool DrawingBuffer::copyToPlatformTexture(blink::WebGraphicsContext3D* context,
}
m_context->flush();
}
- Platform3DObject sourceTexture = m_colorBuffer;
- if (!context->makeContextCurrent())
+ if (!Extensions3DUtil::canUseCopyTextureCHROMIUM(internalFormat, destType, level))
return false;
- if (!Extensions3DUtil::canUseCopyTextureCHROMIUM(internalFormat, destType, level))
+ GLint boundTexture = 0;
+ m_context->getIntegerv(GL_TEXTURE_BINDING_2D, &boundTexture);
+
+ // Context may be in a different share group. Must copy texture first
Ken Russell (switch to Gerrit) 2014/03/04 03:55:03 Please clarify the comment. Something like "Must t
+ RefPtr<MailboxInfo> bufferMailbox = adoptRef(new MailboxInfo());
+ m_context->genMailboxCHROMIUM(bufferMailbox->mailbox.name);
Ken Russell (switch to Gerrit) 2014/03/04 03:55:03 There's an attempt elsewhere in the DrawingBuffer
+ m_context->bindTexture(GL_TEXTURE_2D, m_colorBuffer);
+ m_context->produceTextureCHROMIUM(GL_TEXTURE_2D, bufferMailbox->mailbox.name);
+ m_context->flush();
+
+ bufferMailbox->mailbox.syncPoint = m_context->insertSyncPoint();
+ m_context->waitSyncPoint(bufferMailbox->mailbox.syncPoint);
+
+ m_context->bindTexture(GL_TEXTURE_2D, boundTexture);
+
+ if (!context->makeContextCurrent())
return false;
+ Platform3DObject sourceTexture = context->createTexture();
+
+ context->getIntegerv(GL_TEXTURE_BINDING_2D, &boundTexture);
+ context->bindTexture(GL_TEXTURE_2D, sourceTexture);
+ context->consumeTextureCHROMIUM(GL_TEXTURE_2D, bufferMailbox->mailbox.name);
+
bool unpackPremultiplyAlphaNeeded = false;
bool unpackUnpremultiplyAlphaNeeded = false;
if (m_attributes.alpha && m_attributes.premultipliedAlpha && !premultiplyAlpha)
@@ -351,6 +371,10 @@ bool DrawingBuffer::copyToPlatformTexture(blink::WebGraphicsContext3D* context,
context->pixelStorei(GC3D_UNPACK_FLIP_Y_CHROMIUM, false);
context->pixelStorei(GC3D_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM, false);
context->pixelStorei(GC3D_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM, false);
+
+ context->bindTexture(GL_TEXTURE_2D, boundTexture);
+ context->deleteTexture(sourceTexture);
+
context->flush();
return true;

Powered by Google App Engine
This is Rietveld 408576698