Initialize default texture for GL_TEXTURE_3D and GL_TEXTURE_2D_ARRAY

gpu/command_buffer/service/texture_manager_unittest.cc

Index: gpu/command_buffer/service/texture_manager_unittest.cc
diff --git a/gpu/command_buffer/service/texture_manager_unittest.cc b/gpu/command_buffer/service/texture_manager_unittest.cc
index 231fc04224477fa9f6998bea1e2927a21a404d6a..c3237f2ec8b01ab49612a67a140554bb9b1614d0 100644
--- a/gpu/command_buffer/service/texture_manager_unittest.cc
+++ b/gpu/command_buffer/service/texture_manager_unittest.cc
@@ -78,7 +78,7 @@ class TextureManagerTest : public GpuServiceTest {
                                       kMax3DTextureSize,
                                       kUseDefaultTextures));
     TestHelper::SetupTextureManagerInitExpectations(
-        gl_.get(), "", kUseDefaultTextures);
+        gl_.get(), false, "", kUseDefaultTextures);
     manager_->Initialize();
     error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>());
   }
@@ -177,10 +177,18 @@ TEST_F(TextureManagerTest, SetParameter) {
 
 TEST_F(TextureManagerTest, UseDefaultTexturesTrue) {
   bool use_default_textures = true;
-  scoped_refptr<FeatureInfo> feature_info(new FeatureInfo());
-
-  TestHelper::SetupTextureManagerInitExpectations(
-      gl_.get(), "GL_ANGLE_texture_usage", use_default_textures);
+  TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(

[Zhenyao Mo, 2015/09/15 18:37:16]

Can you add a function to handle feature_info_ setup for ES3? So it can be
shared here and reused in the feature.

Also, can you test the ES2 cases AND the ES3 case? i.e., instead of modifying
UseDefaultTextures{True|False}, add UseDefaultTextures{True|False}ES3.

[qiankun, 2015/09/17 09:39:27]

Done.

+      gl_.get(), "", "", "OpenGL ES 3.0");
+  feature_info_->Initialize();
+  EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_COLOR_ATTACHMENTS, _))
+      .WillOnce(SetArgPointee<1>(8))
+      .RetiresOnSaturation();
+  EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_DRAW_BUFFERS, _))
+      .WillOnce(SetArgPointee<1>(8))
+      .RetiresOnSaturation();
+  feature_info_->EnableES3Validators();
+  TestHelper::SetupTextureManagerInitExpectations(gl_.get(),
+      true, "GL_ANGLE_texture_usage", use_default_textures);
   TextureManager manager(NULL,
                          feature_info_.get(),
                          kMaxTextureSize,
@@ -191,6 +199,8 @@ TEST_F(TextureManagerTest, UseDefaultTexturesTrue) {
   manager.Initialize();
 
   EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_2D) != NULL);
+  EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_3D) != NULL);
+  EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_2D_ARRAY) != NULL);
   EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_CUBE_MAP) != NULL);
 
   // TODO(vmiura): Test GL_TEXTURE_EXTERNAL_OES & GL_TEXTURE_RECTANGLE_ARB.
@@ -200,8 +210,18 @@ TEST_F(TextureManagerTest, UseDefaultTexturesTrue) {
 
 TEST_F(TextureManagerTest, UseDefaultTexturesFalse) {
   bool use_default_textures = false;
-  TestHelper::SetupTextureManagerInitExpectations(
-      gl_.get(), "GL_ANGLE_texture_usage", use_default_textures);
+  TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
+      gl_.get(), "", "", "OpenGL ES 3.0");
+  feature_info_->Initialize();
+  EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_COLOR_ATTACHMENTS, _))
+      .WillOnce(SetArgPointee<1>(8))
+      .RetiresOnSaturation();
+  EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_DRAW_BUFFERS, _))
+      .WillOnce(SetArgPointee<1>(8))
+      .RetiresOnSaturation();
+  feature_info_->EnableES3Validators();
+  TestHelper::SetupTextureManagerInitExpectations(gl_.get(),
+      true, "GL_ANGLE_texture_usage", use_default_textures);
   TextureManager manager(NULL,
                          feature_info_.get(),
                          kMaxTextureSize,
@@ -212,6 +232,8 @@ TEST_F(TextureManagerTest, UseDefaultTexturesFalse) {
   manager.Initialize();
 
   EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_2D) == NULL);
+  EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_3D) == NULL);
+  EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_2D_ARRAY) == NULL);
   EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_CUBE_MAP) == NULL);
 
   // TODO(vmiura): Test GL_TEXTURE_EXTERNAL_OES & GL_TEXTURE_RECTANGLE_ARB.
@@ -221,7 +243,7 @@ TEST_F(TextureManagerTest, UseDefaultTexturesFalse) {
 
 TEST_F(TextureManagerTest, TextureUsageExt) {
   TestHelper::SetupTextureManagerInitExpectations(
-      gl_.get(), "GL_ANGLE_texture_usage", kUseDefaultTextures);
+      gl_.get(), false, "GL_ANGLE_texture_usage", kUseDefaultTextures);
   TextureManager manager(NULL,
                          feature_info_.get(),
                          kMaxTextureSize,
@@ -249,7 +271,7 @@ TEST_F(TextureManagerTest, Destroy) {
   const GLuint kClient1Id = 1;
   const GLuint kService1Id = 11;
   TestHelper::SetupTextureManagerInitExpectations(
-      gl_.get(), "", kUseDefaultTextures);
+      gl_.get(), false, "", kUseDefaultTextures);
   TextureManager manager(NULL,
                          feature_info_.get(),
                          kMaxTextureSize,
@@ -267,7 +289,7 @@ TEST_F(TextureManagerTest, Destroy) {
       .Times(1)
       .RetiresOnSaturation();
   TestHelper::SetupTextureManagerDestructionExpectations(
-      gl_.get(), "", kUseDefaultTextures);
+      gl_.get(), false, "", kUseDefaultTextures);
   manager.Destroy(true);
   // Check that resources got freed.
   texture = manager.GetTexture(kClient1Id);
@@ -1824,10 +1846,10 @@ class SharedTextureTest : public GpuServiceTest {
                            TextureManagerTest::kMax3DTextureSize,
                            kUseDefaultTextures));
     TestHelper::SetupTextureManagerInitExpectations(
-        gl_.get(), "", kUseDefaultTextures);
+        gl_.get(), false, "", kUseDefaultTextures);
     texture_manager1_->Initialize();
     TestHelper::SetupTextureManagerInitExpectations(
-        gl_.get(), "", kUseDefaultTextures);
+        gl_.get(), false, "", kUseDefaultTextures);
     texture_manager2_->Initialize();
   }