gpu/config/gpu_info_collector.cc - Issue 681713002: Update from chromium https://crrev.com/301315

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/config/gpu_info_collector.cc

Issue 681713002: Update from chromium https://crrev.com/301315 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: gpu/config/gpu_info_collector.cc

diff --git a/gpu/config/gpu_info_collector.cc b/gpu/config/gpu_info_collector.cc

index 78dfe22d8ff32b2b202dff21191ae20b0f239fd0..5d255460b52eaaef085d9dc3f3ec9a6c95f30926 100644

--- a/gpu/config/gpu_info_collector.cc

+++ b/gpu/config/gpu_info_collector.cc

@@ -156,6 +156,8 @@ void MergeGPUInfoGL(GPUInfo* basic_gpu_info,

basic_gpu_info->direct_rendering = context_gpu_info.direct_rendering;

basic_gpu_info->context_info_state = context_gpu_info.context_info_state;

basic_gpu_info->initialization_time = context_gpu_info.initialization_time;

+ basic_gpu_info->video_encode_accelerator_supported_profiles =

+ context_gpu_info.video_encode_accelerator_supported_profiles;

}

} // namespace gpu

« no previous file with comments | « gpu/config/gpu_info.cc ('k') | gpu/config/gpu_info_unittest.cc » ('j') | no next file with comments »