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

Side by Side Diff: ui/gl/gl_surface_win.cc

Issue 1051253008: gpu: Upgrade to new ANGLE Platform Display init. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix double "command_line" Created 5 years, 8 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 unified diff | Download patch
« ui/gl/gl_surface_egl.cc ('K') | « ui/gl/gl_surface_egl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gl/gl_surface.h" 5 #include "ui/gl/gl_surface.h"
6 6
7 #include <dwmapi.h> 7 #include <dwmapi.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 } 334 }
335 case kGLImplementationMockGL: 335 case kGLImplementationMockGL:
336 return new GLSurfaceStub; 336 return new GLSurfaceStub;
337 default: 337 default:
338 NOTREACHED(); 338 NOTREACHED();
339 return NULL; 339 return NULL;
340 } 340 }
341 } 341 }
342 342
343 EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() { 343 EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() {
344 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 344 return GetDC(NULL);
345 switches::kDisableD3D11) ||
346 base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseWarp))
347 return GetDC(NULL);
348 return EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE;
349 } 345 }
350 346
351 } // namespace gfx 347 } // namespace gfx
OLDNEW
« ui/gl/gl_surface_egl.cc ('K') | « ui/gl/gl_surface_egl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698