Chromium Code Reviews| Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc |
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc |
| index 8e56d70833c921ce4465c60f968ae5bbd7b48ccf..7099cd8be28c728cdc3419a28975ab6f21f46332 100644 |
| --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc |
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc |
| @@ -76,7 +76,7 @@ void GLES2DecoderTestBase::InitDecoder( |
| 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 end
greggman
2011/07/20 01:41:18
Yes, NULL for that parameter means "give me all ex
no sievers
2011/07/20 23:00:37
I think I confused myself here due to a typo I had
|
| + EXPECT_TRUE(group_->Initialize(DisallowedExtensions(), extensions)); |
| EXPECT_CALL(*gl_, EnableVertexAttribArray(0)) |
| .Times(1) |
| @@ -110,6 +110,13 @@ void GLES2DecoderTestBase::InitDecoder( |
| 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) |