Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / cc / test / test_gles2_interface.cc

diff --git a/src/cc/test/test_gles2_interface.cc b/src/cc/test/test_gles2_interface.cc
index 732c8a2..26ba3e1 100644 (file)
--- a/src/cc/test/test_gles2_interface.cc
+++ b/src/cc/test/test_gles2_interface.cc
@@ -226,7 +226,7 @@ void TestGLES2Interface::TexParameteri(GLenum target,
 
 void TestGLES2Interface::AsyncTexImage2DCHROMIUM(GLenum target,
                                                  GLint level,
-                                                 GLint internalformat,
+                                                 GLenum internalformat,
                                                  GLsizei width,
                                                  GLsizei height,
                                                  GLint border,
@@ -275,16 +275,18 @@ void TestGLES2Interface::WaitAsyncTexImage2DCHROMIUM(GLenum target) {
 
 GLuint TestGLES2Interface::CreateImageCHROMIUM(GLsizei width,
                                                GLsizei height,
-                                               GLenum internalformat) {
-  return test_context_->createImageCHROMIUM(width, height, internalformat);
+                                               GLenum internalformat,
+                                               GLenum usage) {
+  return test_context_->createImageCHROMIUM(
+      width, height, internalformat, usage);
 }
 
 void TestGLES2Interface::DestroyImageCHROMIUM(GLuint image_id) {
   test_context_->destroyImageCHROMIUM(image_id);
 }
 
-void* TestGLES2Interface::MapImageCHROMIUM(GLuint image_id, GLenum access) {
-  return test_context_->mapImageCHROMIUM(image_id, access);
+void* TestGLES2Interface::MapImageCHROMIUM(GLuint image_id) {
+  return test_context_->mapImageCHROMIUM(image_id);
 }
 
 void TestGLES2Interface::GetImageParameterivCHROMIUM(GLuint image_id,
@@ -358,11 +360,23 @@ void TestGLES2Interface::ProduceTextureCHROMIUM(GLenum target,
   test_context_->produceTextureCHROMIUM(target, mailbox);
 }
 
+void TestGLES2Interface::ProduceTextureDirectCHROMIUM(GLuint texture,
+                                                      GLenum target,
+                                                      const GLbyte* mailbox) {
+  test_context_->produceTextureDirectCHROMIUM(texture, target, mailbox);
+}
+
 void TestGLES2Interface::ConsumeTextureCHROMIUM(GLenum target,
                                                 const GLbyte* mailbox) {
   test_context_->consumeTextureCHROMIUM(target, mailbox);
 }
 
+GLuint TestGLES2Interface::CreateAndConsumeTextureCHROMIUM(
+    GLenum target,
+    const GLbyte* mailbox) {
+  return test_context_->createAndConsumeTextureCHROMIUM(target, mailbox);
+}
+
 void TestGLES2Interface::ResizeCHROMIUM(GLuint width,
                                         GLuint height,
                                         float device_scale) {