ui/gl/gl_surface_egl.cc - Issue 24120004: Add an enable D3D11 flag and blacklist specific intel drivers and windows vista from using D3D11.

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: ui/gl/gl_surface_egl.cc

Issue 24120004: Add an enable D3D11 flag and blacklist specific intel drivers and windows vista from using D3D11. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed merge issue Created 7 years, 3 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:

View side-by-side diff with in-line comments

Download patch

Index: ui/gl/gl_surface_egl.cc

diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc

index 5f4edf4783f369c461a95a07bc0b9eaf1dac4417..af9bccedadcc9ea2d3ad32041ca597dafe8309bc 100644

--- a/ui/gl/gl_surface_egl.cc

+++ b/ui/gl/gl_surface_egl.cc

@@ -104,7 +104,8 @@ bool GLSurfaceEGL::InitializeOneOff() {

g_native_display = base::MessagePumpForUI::GetDefaultXDisplay();

#elif defined(OS_WIN)

g_native_display = EGL_DEFAULT_DISPLAY;

- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableD3D11)) {

+ if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableD3D11) &&

+ CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableD3D11)) {

g_native_display = EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE;

}

#elif defined(USE_OZONE)

« no previous file with comments | « gpu/config/gpu_driver_bug_list_json.cc ('k') | ui/gl/gl_switches.h » ('j') | no next file with comments »