gpu: Add CHROMIUM_texture_from_image spec and fence support.

gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc

 // Copyright 2014 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 "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/command_line.h"
@@ skipping 3354 matching lines @@
       texture->GetLevelSize(GL_TEXTURE_2D, 0, &width, &height, nullptr));
   EXPECT_EQ(3, width);
   EXPECT_EQ(1, height);
   EXPECT_TRUE(texture->GetLevelType(GL_TEXTURE_2D, 0, &type, &internal_format));
   EXPECT_EQ(static_cast<GLenum>(GL_RGBA), internal_format);
   EXPECT_EQ(static_cast<GLenum>(GL_UNSIGNED_BYTE), type);
   EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 0) == NULL);
 
   // Bind image to texture.
   // ScopedGLErrorSuppressor calls GetError on its constructor and destructor.
-  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, 1);
+  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, 1, 0);
   EXPECT_TRUE(
       texture->GetLevelSize(GL_TEXTURE_2D, 0, &width, &height, nullptr));
   // Image should now be set.
   EXPECT_FALSE(texture->GetLevelImage(GL_TEXTURE_2D, 0) == NULL);
 
   // Define new texture image.
   DoTexImage2D(
       GL_TEXTURE_2D, 0, GL_RGBA, 3, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, 0);
   EXPECT_TRUE(
       texture->GetLevelSize(GL_TEXTURE_2D, 0, &width, &height, nullptr));
   // Image should no longer be set.
   EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 0) == NULL);
 }
 
 TEST_P(GLES2DecoderTest, BindTexImage2DCHROMIUMCubeMapNotAllowed) {
   scoped_refptr<gl::GLImage> image(new gl::GLImageStub);
   GetImageManager()->AddImage(image.get(), 1);
   DoBindTexture(GL_TEXTURE_CUBE_MAP, client_texture_id_, kServiceTextureId);
 
   BindTexImage2DCHROMIUM bind_tex_image_2d_cmd;
-  bind_tex_image_2d_cmd.Init(GL_TEXTURE_CUBE_MAP, 1);
+  bind_tex_image_2d_cmd.Init(GL_TEXTURE_CUBE_MAP, 1, 0);
   EXPECT_EQ(error::kNoError, ExecuteCmd(bind_tex_image_2d_cmd));
   EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
 }
 
 TEST_P(GLES2DecoderTest, OrphanGLImageWithTexImage2D) {
   scoped_refptr<gl::GLImage> image(new gl::GLImageStub);
   GetImageManager()->AddImage(image.get(), 1);
   DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
 
-  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, 1);
+  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, 1, 0);
 
   TextureRef* texture_ref =
       group().texture_manager()->GetTexture(client_texture_id_);
   ASSERT_TRUE(texture_ref != NULL);
   Texture* texture = texture_ref->texture();
 
   EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 0) == image.get());
   DoTexImage2D(
       GL_TEXTURE_2D, 0, GL_RGBA, 3, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, 0);
   EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 0) == NULL);
@@ skipping 20 matching lines @@
   GLenum type = GL_UNSIGNED_BYTE;
   uint32_t pixels_shm_id = kSharedMemoryId;
   uint32_t pixels_shm_offset = kSharedMemoryOffset;
   GLboolean internal = 0;
 
   // Define texture first.
   DoTexImage2D(target, level, format, width, height, border, format, type,
                pixels_shm_id, pixels_shm_offset);
 
   // Bind texture to GLImage.
-  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, 1);
+  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, 1, 0);
 
   // Check binding.
   TextureRef* texture_ref =
       group().texture_manager()->GetTexture(client_texture_id_);
   ASSERT_TRUE(texture_ref != NULL);
   Texture* texture = texture_ref->texture();
   EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 0) == image.get());
 
   // TexSubImage2D should not unbind GLImage.
   EXPECT_CALL(*gl_, TexSubImage2D(target, level, xoffset, yoffset, width,
@@ skipping 23 matching lines @@
   GLenum format = GL_RGBA;
   GLenum type = GL_UNSIGNED_BYTE;
   uint32_t pixels_shm_id = kSharedMemoryId;
   uint32_t pixels_shm_offset = kSharedMemoryOffset;
 
   // Define texture first.
   DoTexImage2D(target, level, format, width, height, border, format, type,
                pixels_shm_id, pixels_shm_offset);
 
   // Bind texture to GLImage.
-  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, 1);
+  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, 1, 0);
 
   // Check binding.
   TextureRef* texture_ref =
       group().texture_manager()->GetTexture(client_texture_id_);
   ASSERT_TRUE(texture_ref != NULL);
   Texture* texture = texture_ref->texture();
   EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 0) == image.get());
 
   // ClearLevel should use glTexSubImage2D to avoid unbinding GLImage.
   EXPECT_CALL(*gl_, BindTexture(GL_TEXTURE_2D, kServiceTextureId))
@@ skipping 31 matching lines @@
       texture->GetLevelSize(GL_TEXTURE_2D, 0, &width, &height, nullptr));
   EXPECT_EQ(3, width);
   EXPECT_EQ(1, height);
   EXPECT_TRUE(texture->GetLevelType(GL_TEXTURE_2D, 0, &type, &internal_format));
   EXPECT_EQ(static_cast<GLenum>(GL_RGBA), internal_format);
   EXPECT_EQ(static_cast<GLenum>(GL_UNSIGNED_BYTE), type);
   EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 0) == NULL);
 
   // Bind image to texture.
   // ScopedGLErrorSuppressor calls GetError on its constructor and destructor.
-  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, 1);
+  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, 1, 0);
   EXPECT_TRUE(
       texture->GetLevelSize(GL_TEXTURE_2D, 0, &width, &height, nullptr));
   // Image should now be set.
   EXPECT_FALSE(texture->GetLevelImage(GL_TEXTURE_2D, 0) == NULL);
 
   // Release image from texture.
   // ScopedGLErrorSuppressor calls GetError on its constructor and destructor.
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
   ReleaseTexImage2DCHROMIUM release_tex_image_2d_cmd;
   release_tex_image_2d_cmd.Init(GL_TEXTURE_2D, 1);
   EXPECT_EQ(error::kNoError, ExecuteCmd(release_tex_image_2d_cmd));
   EXPECT_TRUE(
       texture->GetLevelSize(GL_TEXTURE_2D, 0, &width, &height, nullptr));
   // Image should no longer be set.
   EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 0) == NULL);
 }
 
 class MockGLImage : public gl::GLImage {
  public:
   MockGLImage() {}
 
   // Overridden from gl::GLImage:
   MOCK_METHOD0(GetSize, gfx::Size());
   MOCK_METHOD0(GetInternalFormat, unsigned());
   MOCK_METHOD1(Destroy, void(bool));
-  MOCK_METHOD1(BindTexImage, bool(unsigned));
+  MOCK_METHOD2(BindTexImage, bool(unsigned, gl::GLFence*));
   MOCK_METHOD1(ReleaseTexImage, void(unsigned));
   MOCK_METHOD1(CopyTexImage, bool(unsigned));
   MOCK_METHOD3(CopyTexSubImage,
                bool(unsigned, const gfx::Point&, const gfx::Rect&));
   MOCK_METHOD5(ScheduleOverlayPlane, bool(gfx::AcceleratedWidget,
                                           int,
                                           gfx::OverlayTransform,
                                           const gfx::Rect&,
                                           const gfx::RectF&));
   MOCK_METHOD3(OnMemoryDump,
@@ skipping 23 matching lines @@
       group().texture_manager()->GetTexture(client_texture_id_);
   ASSERT_TRUE(texture_ref != NULL);
   Texture* texture = texture_ref->texture();
   EXPECT_EQ(kServiceTextureId, texture->service_id());
 
   const int32_t kImageId = 1;
   scoped_refptr<MockGLImage> image(new MockGLImage);
   GetImageManager()->AddImage(image.get(), kImageId);
 
   // Bind image to texture.
-  EXPECT_CALL(*image.get(), BindTexImage(GL_TEXTURE_2D))
+  EXPECT_CALL(*image.get(), BindTexImage(GL_TEXTURE_2D, nullptr))
       .Times(1)
       .WillOnce(Return(false))
       .RetiresOnSaturation();
   EXPECT_CALL(*image.get(), GetSize())
       .Times(1)
       .WillOnce(Return(gfx::Size(1, 1)))
       .RetiresOnSaturation();
   EXPECT_CALL(*image.get(), GetInternalFormat())
       .Times(1)
       .WillOnce(Return(GL_RGBA))
       .RetiresOnSaturation();
   // ScopedGLErrorSuppressor calls GetError on its constructor and destructor.
-  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, kImageId);
+  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, kImageId, 0);
 
   AddExpectationsForSimulatedAttrib0(kNumVertices, 0);
   SetupExpectationsForApplyingDefaultDirtyState();
 
   // ScopedGLErrorSuppressor calls GetError on its constructor and destructor.
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
   EXPECT_CALL(*gl_, ActiveTexture(GL_TEXTURE0)).Times(2).RetiresOnSaturation();
   EXPECT_CALL(*image.get(), CopyTexImage(GL_TEXTURE_2D))
       .Times(1)
       .WillOnce(Return(true))
       .RetiresOnSaturation();
   EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))
       .Times(1)
       .RetiresOnSaturation();
   DrawArrays cmd;
   cmd.Init(GL_TRIANGLES, 0, kNumVertices);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 
   DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
   // Re-bind image to texture.
   ReleaseTexImage2DCHROMIUM release_tex_image_2d_cmd;
   release_tex_image_2d_cmd.Init(GL_TEXTURE_2D, kImageId);
   EXPECT_EQ(error::kNoError, ExecuteCmd(release_tex_image_2d_cmd));
-  EXPECT_CALL(*image.get(), BindTexImage(GL_TEXTURE_2D))
+  EXPECT_CALL(*image.get(), BindTexImage(GL_TEXTURE_2D, nullptr))
       .Times(1)
       .WillOnce(Return(false))
       .RetiresOnSaturation();
   EXPECT_CALL(*image.get(), GetSize())
       .Times(1)
       .WillOnce(Return(gfx::Size(1, 1)))
       .RetiresOnSaturation();
   EXPECT_CALL(*image.get(), GetInternalFormat())
       .Times(1)
       .WillOnce(Return(GL_RGBA))
       .RetiresOnSaturation();
-  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, kImageId);
+  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, kImageId, 0);
 
   DoBindFramebuffer(
       GL_FRAMEBUFFER, client_framebuffer_id_, kServiceFramebufferId);
   // ScopedGLErrorSuppressor calls GetError on its constructor and destructor.
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
   EXPECT_CALL(*gl_, ActiveTexture(GL_TEXTURE0)).Times(1).RetiresOnSaturation();
   EXPECT_CALL(*gl_, BindTexture(GL_TEXTURE_2D, kServiceTextureId))
@@ skipping 672 matching lines @@
       int image_id = use_rgb_emulation * 2 + destination_texture_index;
       scoped_refptr<gl::GLImage> image;
       if (use_rgb_emulation)
         image = new EmulatingRGBImageStub;
       else
         image = new gl::GLImageStub;
       GetImageManager()->AddImage(image.get(), image_id);
       EXPECT_FALSE(GetImageManager()->LookupImage(image_id) == NULL);
       DoBindTexture(GL_TEXTURE_2D, kFBOClientTextureId, kFBOServiceTextureId);
 
-      DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, image_id);
+      DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, image_id, 0);
       DoFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, target,
                              kFBOClientTextureId, kFBOServiceTextureId, level,
                              GL_NO_ERROR);
 
       GLenum destination_texture_format =
           destination_texture_formats[destination_texture_index];
       bool should_succeed =
           !use_rgb_emulation || (destination_texture_format == GL_RGB);
       if (should_succeed) {
         EXPECT_CALL(*gl_, GetError())
@@ skipping 87 matching lines @@
 // TODO(gman): CompressedTexSubImage2DImmediate
 
 // TODO(gman): TexImage2D
 
 // TODO(gman): TexImage2DImmediate
 
 // TODO(gman): TexSubImage2DImmediate
 
 }  // namespace gles2
 }  // namespace gpu