Mailbox support for texture layers.

cc/resource_provider.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resource_provider.h"
 
 #include <limits.h>
 
 #include "base/debug/alias.h"
 #include "base/hash_tables.h"
@@ skipping 216 matching lines @@
     GLC(context3d, context3d->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE));
     GLC(context3d, context3d->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE));
 
     ResourceId id = m_nextId++;
     Resource resource(textureId, gfx::Size(), 0, GL_LINEAR);
     resource.external = true;
     m_resources[id] = resource;
     return id;
 }
 
+ResourceProvider::ResourceId ResourceProvider::createResourceFromTextureMailbox(const std::string& mailbox, const base::Callback<void(unsigned)>& releaseCallback)
+{
+    DCHECK(m_threadChecker.CalledOnValidThread());
+
+    const int8* name = reinterpret_cast<const int8*>(mailbox.data());
+    WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+    DCHECK(context3d);
+    unsigned textureId;
+    GLC(context3d, textureId = context3d->createTexture());

[jamesr, 2013/01/03 23:40:14]

just do the assignment textureID = context3D->createTexture() on the previous
line. there's no point in doing a glGetError after a createTexture call since it
just allocates a client side id

[alexst (slow to review), 2013/01/04 16:20:48]

Copy-pasted code from above, I'll clean up.

On 2013/01/03 23:40:14, jamesr wrote:

+    GLC(context3d, context3d->bindTexture(GL_TEXTURE_2D, textureId));
+    GLC(context3d, context3d->consumeTextureCHROMIUM(GL_TEXTURE_2D, name));
+    GLC(context3d, context3d->flush());

[jamesr, 2013/01/03 23:40:14]

similarly no reason to glGetError after a flush - if the consume call generated
an error the GLC macro would catch it there

why are you flushing here? for correctness?

[alexst (slow to review), 2013/01/04 16:20:48]

Backing texture for the mailbox is in a different context, we need to make sure
it latches to the newly generated texture id before we start using it.

On 2013/01/03 23:40:14, jamesr wrote:

+
+    ResourceId id = m_nextId++;
+    Resource resource(textureId, gfx::Size(), 0, GL_LINEAR);
+    resource.external = true;
+    resource.mailbox.setName(name);
+    resource.mailbox.releaseCallback = releaseCallback;
+    m_resources[id] = resource;
+    return id;
+}
+
 void ResourceProvider::deleteResource(ResourceId id)
 {
     DCHECK(m_threadChecker.CalledOnValidThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     Resource* resource = &it->second;
     DCHECK(!resource->lockedForWrite);
     DCHECK(!resource->lockForReadCount);
     DCHECK(!resource->markedForDeletion);
 
@@ skipping 15 matching lines @@
     if (resource->glUploadQueryId) {
         WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
         DCHECK(context3d);
         GLC(context3d, context3d->deleteQueryEXT(resource->glUploadQueryId));
     }
     if (resource->glPixelBufferId) {
         WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
         DCHECK(context3d);
         GLC(context3d, context3d->deleteBuffer(resource->glPixelBufferId));
     }
+    if (!resource->mailbox.isZero() && resource->external) {
+        WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+        DCHECK(context3d);
+        GLC(context3d, context3d->bindTexture(GL_TEXTURE_2D, resource->glId));
+        GLC(context3d, context3d->produceTextureCHROMIUM(GL_TEXTURE_2D, resource->mailbox.name));
+        GLC(context3d, context3d->deleteTexture(resource->glId));
+        if (!resource->mailbox.releaseCallback.is_null()) {
+            unsigned syncPoint = 0;
+            GLC(context3d, syncPoint = context3d->insertSyncPoint());
+            resource->mailbox.releaseCallback.Run(syncPoint);
+        }
+    }
     if (resource->pixels)
         delete[] resource->pixels;
     if (resource->pixelBuffer)
         delete[] resource->pixelBuffer;
 
     m_resources.erase(it);
 }
 
 ResourceProvider::ResourceType ResourceProvider::resourceType(ResourceId id)
 {
@@ skipping 667 matching lines @@
             return false;
     }
 
     resource->pendingSetPixels = false;
     unlockForWrite(id);
 
     return true;
 }
 
 }  // namespace cc