Add GL_CHROMIUM_texture_mailbox entrypoints to wgc3d implementations

BUG=131275


Review URL: https://chromiumcodereview.appspot.com/10829209

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150241 0039d316-1c4b-4281-b951-d872f2087c98

content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc

@@ -945,10 +945,6 @@ void WebGraphicsContext3DCommandBufferImpl::flush() {
     gl_->FreeEverything();
 }
 
-void WebGraphicsContext3DCommandBufferImpl::shallowFlushCHROMIUM() {
-  gl_->ShallowFlushCHROMIUM();
-}
-
 DELEGATE_TO_GL_4(framebufferRenderbuffer, FramebufferRenderbuffer,
                  WGC3Denum, WGC3Denum, WGC3Denum, WebGLId)
 
@@ -1536,6 +1532,14 @@ DELEGATE_TO_GL_5(copyTextureCHROMIUM, CopyTextureCHROMIUM,  WGC3Denum,
 DELEGATE_TO_GL_3(bindUniformLocationCHROMIUM, BindUniformLocationCHROMIUM,
                  WebGLId, WGC3Dint, const WGC3Dchar*)
 
+DELEGATE_TO_GL(shallowFlushCHROMIUM,ShallowFlushCHROMIUM);
+
+DELEGATE_TO_GL_1(genMailboxCHROMIUM, GenMailboxCHROMIUM, WGC3Dbyte*)
+DELEGATE_TO_GL_2(produceTextureCHROMIUM, ProduceTextureCHROMIUM,
+                 WGC3Denum, const WGC3Dbyte*)
+DELEGATE_TO_GL_2(consumeTextureCHROMIUM, ConsumeTextureCHROMIUM,
+                 WGC3Denum, const WGC3Dbyte*)
+
 GrGLInterface* WebGraphicsContext3DCommandBufferImpl::onCreateGrGLInterface() {
   return webkit_glue::CreateCommandBufferSkiaGLBinding();
 }

content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h

@@ -41,6 +41,7 @@ class GLES2Implementation;
 
 using WebKit::WebGLId;
 
+using WebKit::WGC3Dbyte;
 using WebKit::WGC3Dchar;
 using WebKit::WGC3Denum;
 using WebKit::WGC3Dboolean;
@@ -247,7 +248,6 @@ class WebGraphicsContext3DCommandBufferImpl
   virtual void enableVertexAttribArray(WGC3Duint index);
   virtual void finish();
   virtual void flush();
-  virtual void shallowFlushCHROMIUM();
   virtual void framebufferRenderbuffer(WGC3Denum target,
                                        WGC3Denum attachment,
                                        WGC3Denum renderbuffertarget,
@@ -574,6 +574,14 @@ class WebGraphicsContext3DCommandBufferImpl
   virtual void bindUniformLocationCHROMIUM(WebGLId program, WGC3Dint location,
                                            const WGC3Dchar* uniform);
 
+  virtual void shallowFlushCHROMIUM();
+
+  virtual void genMailboxCHROMIUM(WGC3Dbyte* mailbox);
+  virtual void produceTextureCHROMIUM(WGC3Denum target,
+                                      const WGC3Dbyte* mailbox);
+  virtual void consumeTextureCHROMIUM(WGC3Denum target,
+                                      const WGC3Dbyte* mailbox);
+
  protected:
   virtual GrGLInterface* onCreateGrGLInterface();
 

webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc

@@ -1643,5 +1643,11 @@ DELEGATE_TO_GL_3(bindUniformLocationCHROMIUM, BindUniformLocationCHROMIUM,
 
 DELEGATE_TO_GL(shallowFlushCHROMIUM, ShallowFlushCHROMIUM)
 
+DELEGATE_TO_GL_1(genMailboxCHROMIUM, GenMailboxCHROMIUM, WGC3Dbyte*)
+DELEGATE_TO_GL_2(produceTextureCHROMIUM, ProduceTextureCHROMIUM,
+                 WGC3Denum, const WGC3Dbyte*)
+DELEGATE_TO_GL_2(consumeTextureCHROMIUM, ConsumeTextureCHROMIUM,
+                 WGC3Denum, const WGC3Dbyte*)
+
 }  // namespace gpu
 }  // namespace webkit

webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h

@@ -26,6 +26,7 @@ class GLES2Implementation;
 
 using WebKit::WebGLId;
 
+using WebKit::WGC3Dbyte;
 using WebKit::WGC3Dchar;
 using WebKit::WGC3Denum;
 using WebKit::WGC3Dboolean;
@@ -483,6 +484,12 @@ class WebGraphicsContext3DInProcessCommandBufferImpl
 
   virtual void shallowFlushCHROMIUM();
 
+  virtual void genMailboxCHROMIUM(WGC3Dbyte* mailbox);
+  virtual void produceTextureCHROMIUM(WGC3Denum target,
+                                      const WGC3Dbyte* mailbox);
+  virtual void consumeTextureCHROMIUM(WGC3Denum target,
+                                      const WGC3Dbyte* mailbox);
+
  protected:
   virtual GrGLInterface* onCreateGrGLInterface();
 

webkit/gpu/webgraphicscontext3d_in_process_impl.cc

@@ -752,6 +752,21 @@ void WebGraphicsContext3DInProcessImpl::bindUniformLocationCHROMIUM(
   NOTIMPLEMENTED();
 }
 
+void WebGraphicsContext3DInProcessImpl::genMailboxCHROMIUM(
+    WGC3Dbyte* mailbox) {
+  NOTIMPLEMENTED();
+}
+
+void WebGraphicsContext3DInProcessImpl::produceTextureCHROMIUM(
+    WGC3Denum target, const WGC3Dbyte* mailbox) {
+  NOTIMPLEMENTED();
+}
+
+void WebGraphicsContext3DInProcessImpl::consumeTextureCHROMIUM(
+    WGC3Denum target, const WGC3Dbyte* mailbox) {
+  NOTIMPLEMENTED();
+}
+
 WebString WebGraphicsContext3DInProcessImpl::
     getRequestableExtensionsCHROMIUM() {
   return WebString();

webkit/gpu/webgraphicscontext3d_in_process_impl.h

@@ -24,6 +24,7 @@ class GLSurface;
 class GLShareGroup;
 }
 
+using WebKit::WGC3Dbyte;
 using WebKit::WGC3Dchar;
 using WebKit::WGC3Denum;
 using WebKit::WGC3Dboolean;
@@ -482,6 +483,12 @@ class WebGraphicsContext3DInProcessImpl : public WebGraphicsContext3D {
   // Only applies to contexts that use the command buffer.
   virtual void shallowFlushCHROMIUM() { }
 
+  virtual void genMailboxCHROMIUM(WGC3Dbyte* mailbox);
+  virtual void produceTextureCHROMIUM(WGC3Denum target,
+                                      const WGC3Dbyte* mailbox);
+  virtual void consumeTextureCHROMIUM(WGC3Denum target,
+                                      const WGC3Dbyte* mailbox);
+
  protected:
   virtual GrGLInterface* onCreateGrGLInterface();