gpu/command_buffer/service/feature_info_unittest.cc - Issue 2443553002: Create correct GLES3 context for GLES3 unittest

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gpu/command_buffer/service/feature_info_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

« no previous file with comments | « no previous file | gpu/command_buffer/service/framebuffer_manager_unittest.cc » ('j') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/feature_info_unittest.cc

diff --git a/gpu/command_buffer/service/feature_info_unittest.cc b/gpu/command_buffer/service/feature_info_unittest.cc

index 49b8d197da6be1566db60ec19e84ccef8f6d98c3..50ada755f9c60f47790f818047e22c886431ef35 100644

--- a/gpu/command_buffer/service/feature_info_unittest.cc

+++ b/gpu/command_buffer/service/feature_info_unittest.cc

@@ -95,7 +95,7 @@ class FeatureInfoTest

const char* extensions, const char* renderer, const char* version) {

GpuServiceTest::SetUpWithGLVersion(version, extensions);

TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(

- gl_.get(), extensions, renderer, version, GetContextType());

+ gl_.get(), extensions, renderer, version);

info_ = new FeatureInfo();

info_->Initialize(GetContextType(), DisallowedFeatures());

}

@@ -107,7 +107,7 @@ class FeatureInfoTest

const DisallowedFeatures& disallowed_features) {

GpuServiceTest::SetUpWithGLVersion(version, extensions);

TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(

- gl_.get(), extensions, renderer, version, GetContextType());

+ gl_.get(), extensions, renderer, version);

info_ = new FeatureInfo();

info_->Initialize(GetContextType(), disallowed_features);

}

@@ -119,7 +119,7 @@ class FeatureInfoTest

const base::CommandLine& command_line) {

GpuServiceTest::SetUpWithGLVersion(version, extensions);

TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(

- gl_.get(), extensions, renderer, version, GetContextType());

+ gl_.get(), extensions, renderer, version);

GpuDriverBugWorkarounds gpu_driver_bug_workaround(&command_line);

info_ = new FeatureInfo(command_line, gpu_driver_bug_workaround);

info_->Initialize(GetContextType(), DisallowedFeatures());

@@ -136,7 +136,7 @@ class FeatureInfoTest

const base::CommandLine& command_line) {

GpuServiceTest::SetUpWithGLVersion("2.0", extensions);

TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(

- gl_.get(), extensions, "", "", GetContextType());

+ gl_.get(), extensions, "", "");

GpuDriverBugWorkarounds gpu_driver_bug_workaround(&command_line);

info_ = new FeatureInfo(command_line, gpu_driver_bug_workaround);

info_->Initialize(GetContextType(), DisallowedFeatures());