Support GL_OES_EGL_image_external

gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

 // Copyright (c) 2011 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_unittest_base.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/string_number_conversions.h"
@@ skipping 58 matching lines @@
   gl_.reset(new StrictMock<MockGLInterface>());
   ::gfx::GLInterface::SetGLInterface(gl_.get());
   surface_manager_.reset(new StrictMock<MockSurfaceManager>);
   group_ = ContextGroup::Ref(new ContextGroup());
 
   InSequence sequence;
 
   TestHelper::SetupContextGroupInitExpectations(gl_.get(),
       DisallowedExtensions(), extensions);
 
-  EXPECT_TRUE(group_->Initialize(DisallowedExtensions(), NULL));

[no sievers, 2011/07/20 00:58:16]

Is it intentional that we pass NULL here which ends up settings up feature_info
without any extensions?
While we do set the expectation for glGetString(GL_EXTENSIONS) to match the
extensions passed in the call above.

Changing this breaks two tests (but I haven't looked at why exactly yet):
GLES2DecoderManualInitTest.RenderbufferStorageMultisampleGLError
GLES2DecoderManualInitTest.GetCompressedTextureFormats

[greggman, 2011/07/20 01:41:18]

Yes, NULL for that parameter means "give me all extensions that are available"
so about at like 76 we set which extensions the OpenGL mock will say are
available where as this line is saying which ones we want to enable.

On 2011/07/20 00:58:16, Daniel Sievers wrote:

[no sievers, 2011/07/20 23:00:37]

I think I confused myself here due to a typo I had somewhere else. I reverted
the change, it works now with passing NULL here as expected.

+  EXPECT_TRUE(group_->Initialize(DisallowedExtensions(), extensions));
 
   EXPECT_CALL(*gl_, EnableVertexAttribArray(0))
       .Times(1)
       .RetiresOnSaturation();
   static GLuint attrib_0_id[] = {
     kServiceAttrib0BufferId,
   };
   static GLuint fixed_attrib_buffer_id[] = {
     kServiceFixedAttribBufferId,
   };
@@ skipping 13 matching lines @@
   EXPECT_CALL(*gl_, GenBuffersARB(arraysize(fixed_attrib_buffer_id), _))
       .WillOnce(SetArrayArgument<1>(
           fixed_attrib_buffer_id,
           fixed_attrib_buffer_id + arraysize(fixed_attrib_buffer_id)))
       .RetiresOnSaturation();
 
   for (GLint tt = 0; tt < TestHelper::kNumTextureUnits; ++tt) {
     EXPECT_CALL(*gl_, ActiveTexture(GL_TEXTURE0 + tt))
         .Times(1)
         .RetiresOnSaturation();
+    if (group_->feature_info()->feature_flags().oes_egl_image_external) {
+      EXPECT_CALL(*gl_, BindTexture(
+          GL_TEXTURE_EXTERNAL_OES,
+          TestHelper::kServiceDefaultExternalTextureId))
+              .Times(1)
+              .RetiresOnSaturation();
+    }
     EXPECT_CALL(*gl_, BindTexture(
         GL_TEXTURE_CUBE_MAP, TestHelper::kServiceDefaultTextureCubemapId))
         .Times(1)
         .RetiresOnSaturation();
     EXPECT_CALL(*gl_, BindTexture(
         GL_TEXTURE_2D, TestHelper::kServiceDefaultTexture2dId))
         .Times(1)
         .RetiresOnSaturation();
   }
   EXPECT_CALL(*gl_, ActiveTexture(GL_TEXTURE0))
@@ skipping 758 matching lines @@
 
 const char* GLES2DecoderWithShaderTestBase::kAttrib1Name = "attrib1";
 const char* GLES2DecoderWithShaderTestBase::kAttrib2Name = "attrib2";
 const char* GLES2DecoderWithShaderTestBase::kAttrib3Name = "attrib3";
 const char* GLES2DecoderWithShaderTestBase::kUniform1Name = "uniform1";
 const char* GLES2DecoderWithShaderTestBase::kUniform2Name = "uniform2[0]";
 const char* GLES2DecoderWithShaderTestBase::kUniform3Name = "uniform3[0]";
 
 }  // namespace gles2
 }  // namespace gpu