From c051ea4b31d507ea53355eb2f79546438d2ed03f Mon Sep 17 00:00:00 2001
From: bajones <bajones@chromium.org>
Date: Fri, 19 Jun 2015 11:40:54 -0700
Subject: [PATCH] Wiring up new command buffer functions to
 WebGraphicsContext3DImpl

BUG=295792

Review URL: https://codereview.chromium.org/1193583003

Cr-Commit-Position: refs/heads/master@{#335304}
---
 gpu/blink/webgraphicscontext3d_impl.cc | 15 +++++++++------
 gpu/blink/webgraphicscontext3d_impl.h  | 23 ++++++++++++++---------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/gpu/blink/webgraphicscontext3d_impl.cc b/gpu/blink/webgraphicscontext3d_impl.cc
index 123ba79aa121..139803ef97b0 100644
--- a/gpu/blink/webgraphicscontext3d_impl.cc
+++ b/gpu/blink/webgraphicscontext3d_impl.cc
@@ -1084,12 +1084,12 @@ DELEGATE_TO_GL_2R(getUniformBlockIndex, GetUniformBlockIndex, WGC3Duint,
                   const WGC3Dchar *, WGC3Duint)
 DELEGATE_TO_GL_4(getUniformIndices, GetUniformIndices, WGC3Duint, WGC3Dsizei,
                  const WGC3Dchar *const*, WGC3Duint *)
-//DELEGATE_TO_GL_3(getUniformuiv, GetUniformuiv, WGC3Duint, WGC3Dint,
-//                 WGC3Duint *)
-//DELEGATE_TO_GL_3(getVertexAttribIiv, GetVertexAttribIiv, WGC3Duint,
-//                 WGC3Denum, WGC3Dint *)
-//DELEGATE_TO_GL_3(getVertexAttribIuiv, GetVertexAttribIuiv, WGC3Duint,
-//                 WGC3Denum, WGC3Duint *)
+DELEGATE_TO_GL_3(getUniformuiv, GetUniformuiv, WGC3Duint, WGC3Dint,
+                 WGC3Duint *)
+DELEGATE_TO_GL_3(getVertexAttribIiv, GetVertexAttribIiv, WGC3Duint,
+                 WGC3Denum, WGC3Dint *)
+DELEGATE_TO_GL_3(getVertexAttribIuiv, GetVertexAttribIuiv, WGC3Duint,
+                 WGC3Denum, WGC3Duint *)
 DELEGATE_TO_GL_3(invalidateFramebuffer, InvalidateFramebuffer, WGC3Denum,
                  WGC3Dsizei, const WGC3Denum *)
 DELEGATE_TO_GL_7(invalidateSubFramebuffer, InvalidateSubFramebuffer, WGC3Denum,
@@ -1101,6 +1101,8 @@ WGC3Dboolean WebGraphicsContext3DImpl::isSync(WGC3Dsync sync) {
 }
 DELEGATE_TO_GL_1R(isTransformFeedback, IsTransformFeedback, WGC3Duint,
                   WGC3Dboolean)
+DELEGATE_TO_GL_4R(mapBufferRange, MapBufferRange, WGC3Denum, WGC3Dintptr,
+                  WGC3Dsizeiptr, WGC3Dbitfield, void*);
 DELEGATE_TO_GL(pauseTransformFeedback, PauseTransformFeedback)
 //DELEGATE_TO_GL_3(programParameteri, ProgramParameteri, WGC3Duint, WGC3Denum,
 //                 WGC3Dint)
@@ -1152,6 +1154,7 @@ DELEGATE_TO_GL_4(uniformMatrix4x2fv, UniformMatrix4x2fv, WGC3Dint, WGC3Dsizei,
                  WGC3Dboolean, const WGC3Dfloat*)
 DELEGATE_TO_GL_4(uniformMatrix4x3fv, UniformMatrix4x3fv, WGC3Dint, WGC3Dsizei,
                  WGC3Dboolean, const WGC3Dfloat*)
+DELEGATE_TO_GL_1R(unmapBuffer, UnmapBuffer, WGC3Denum, WGC3Dboolean);
 DELEGATE_TO_GL_5(vertexAttribI4i, VertexAttribI4i, WGC3Duint, WGC3Dint,
                  WGC3Dint, WGC3Dint, WGC3Dint)
 DELEGATE_TO_GL_2(vertexAttribI4iv, VertexAttribI4iv, WGC3Duint,
diff --git a/gpu/blink/webgraphicscontext3d_impl.h b/gpu/blink/webgraphicscontext3d_impl.h
index c053f8836839..c2f3c8851b15 100644
--- a/gpu/blink/webgraphicscontext3d_impl.h
+++ b/gpu/blink/webgraphicscontext3d_impl.h
@@ -774,15 +774,15 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
                                  blink::WGC3Dsizei uniformCount,
                                  const blink::WGC3Dchar *const*uniformNames,
                                  blink::WGC3Duint *uniformIndices);
-  //virtual void getUniformuiv(blink::WGC3Duint program,
-  //                           blink::WGC3Dint location,
-  //                           blink::WGC3Duint *params);
-  //virtual void getVertexAttribIiv(blink::WGC3Duint index,
-  //                                blink::WGC3Denum pname,
-  //                                blink::WGC3Dint *params);
-  //virtual void getVertexAttribIuiv(blink::WGC3Duint index,
-  //                                 blink::WGC3Denum pname,
-  //                                 blink::WGC3Duint *params);
+  virtual void getUniformuiv(blink::WGC3Duint program,
+                             blink::WGC3Dint location,
+                             blink::WGC3Duint *params);
+  virtual void getVertexAttribIiv(blink::WGC3Duint index,
+                                  blink::WGC3Denum pname,
+                                  blink::WGC3Dint *params);
+  virtual void getVertexAttribIuiv(blink::WGC3Duint index,
+                                   blink::WGC3Denum pname,
+                                   blink::WGC3Duint *params);
   virtual void invalidateFramebuffer(blink::WGC3Denum target,
                                      blink::WGC3Dsizei numAttachments,
                                      const blink::WGC3Denum* attachments);
@@ -796,6 +796,10 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
   virtual blink::WGC3Dboolean isSampler(blink::WebGLId sampler);
   virtual blink::WGC3Dboolean isSync(blink::WGC3Dsync sync);
   virtual blink::WGC3Dboolean isTransformFeedback(blink::WGC3Duint id);
+  virtual void* mapBufferRange(blink::WGC3Denum target,
+                               blink::WGC3Dintptr offset,
+                               blink::WGC3Dsizeiptr length,
+                               blink::WGC3Dbitfield access);
   virtual void pauseTransformFeedback(void);
   //virtual void programParameteri(blink::WGC3Duint program,
   //                               blink::WGC3Denum pname,
@@ -898,6 +902,7 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
                                   blink::WGC3Dsizei count,
                                   blink::WGC3Dboolean transpose,
                                   const blink::WGC3Dfloat* value);
+  virtual blink::WGC3Dboolean unmapBuffer(blink::WGC3Denum target);
   virtual void vertexAttribI4i(blink::WGC3Duint index,
                                blink::WGC3Dint x,
                                blink::WGC3Dint y,
-- 
2.11.4.GIT