Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(193)

Unified Diff: gpu/command_buffer/service/texture_manager_unittest.cc

Issue 2443553002: Create correct GLES3 context for GLES3 unittest (Closed)
Patch Set: remove context_type since it is equivalent to enable_es3 Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..4d99d7ca5c8da7dc7593d9f187bf16bddb05afb3 100644
--- a/gpu/command_buffer/service/texture_manager_unittest.cc
+++ b/gpu/command_buffer/service/texture_manager_unittest.cc
@@ -109,9 +109,11 @@ class TextureManagerTest : public GpuServiceTest {
const char* gl_version,
bool enable_es3) {
TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
- gl_.get(), gl_extensions, "", gl_version,
- feature_info_->context_type(), enable_es3);
- feature_info_->InitializeForTesting();
+ gl_.get(), gl_extensions, "", gl_version, 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))
@@ -2202,8 +2204,7 @@ class SharedTextureTest : public GpuServiceTest {
const char* gl_version,
bool enable_es3) {
TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
- gl_.get(), gl_extensions, "", gl_version,
- feature_info_->context_type(), enable_es3);
+ gl_.get(), gl_extensions, "", gl_version, enable_es3);
feature_info_->InitializeForTesting();
if (enable_es3) {
EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_COLOR_ATTACHMENTS, _))
« gpu/command_buffer/service/test_helper.h ('K') | « gpu/command_buffer/service/test_helper.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698