Chromium Code Reviews| 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 476222672ace590cd35e28cf16dc94b3de0515ff..42941f0bb73f4daf0114baf22b7ac2ef984976b2 100644 |
| --- a/gpu/command_buffer/service/texture_manager_unittest.cc |
| +++ b/gpu/command_buffer/service/texture_manager_unittest.cc |
| @@ -110,8 +110,12 @@ class TextureManagerTest : public GpuServiceTest { |
| bool enable_es3) { |
| TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion( |
| gl_.get(), gl_extensions, "", gl_version, |
| - feature_info_->context_type(), enable_es3); |
| - feature_info_->InitializeForTesting(); |
| + enable_es3 ? CONTEXT_TYPE_OPENGLES3 : feature_info_->context_type(), |
|
Zhenyao Mo
2016/10/21 17:51:20
This is really messy. I think the right fix is to
qiankun
2016/10/22 11:47:13
We may want to create ES2 context even the ES3 api
Zhenyao Mo
2016/10/25 22:41:14
I don't think we want to change test behaviors. We
qiankun
2016/10/25 23:08:13
So, according your last comments we cannot do this
Zhenyao Mo
2016/10/26 00:41:06
The inconsistency between FeatureInfo::context_typ
qiankun
2016/10/28 14:31:21
Featureinfo has a default context_type which is se
yunchao
2016/10/31 15:18:05
The original code is not correct, but the real fix
qiankun
2016/10/31 15:51:53
In this CL, I fixed some ES3 testing for texture m
|
| + enable_es3); |
| + if (enable_es3) |
| + feature_info_->InitializeForTesting(CONTEXT_TYPE_OPENGLES3); |
| + else |
| + feature_info_->InitializeForTesting(); |
| if (enable_es3) { |
| EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_COLOR_ATTACHMENTS, _)) |
| .WillOnce(SetArgPointee<1>(8)) |