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

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

Issue 215053004: Revert "Remove the enable-d3d11 flag so that d3d11 is enabled by default." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and update pixel_tests revision. Created 6 years, 9 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
« no previous file with comments | « ui/gl/gl_switches.h ('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_switches.h" 5 #include "ui/gl/gl_switches.h"
6 #include "base/basictypes.h" 6 #include "base/basictypes.h"
7 7
8 namespace gfx { 8 namespace gfx {
9 9
10 const char kGLImplementationDesktopName[] = "desktop"; 10 const char kGLImplementationDesktopName[] = "desktop";
11 const char kGLImplementationOSMesaName[] = "osmesa"; 11 const char kGLImplementationOSMesaName[] = "osmesa";
12 const char kGLImplementationAppleName[] = "apple"; 12 const char kGLImplementationAppleName[] = "apple";
13 const char kGLImplementationEGLName[] = "egl"; 13 const char kGLImplementationEGLName[] = "egl";
14 const char kGLImplementationSwiftShaderName[] = "swiftshader"; 14 const char kGLImplementationSwiftShaderName[] = "swiftshader";
15 const char kGLImplementationMockName[] = "mock"; 15 const char kGLImplementationMockName[] = "mock";
16 16
17 } // namespace gfx 17 } // namespace gfx
18 18
19 namespace switches { 19 namespace switches {
20 20
21 // Enables use of D3D11 when available.
22 const char kEnableD3D11[] = "enable-d3d11";
23
21 // Disables use of D3D11. 24 // Disables use of D3D11.
22 const char kDisableD3D11[] = "disable-d3d11"; 25 const char kDisableD3D11[] = "disable-d3d11";
23 26
24 // Stop the GPU from synchronizing on the vsync before presenting. 27 // Stop the GPU from synchronizing on the vsync before presenting.
25 const char kDisableGpuVsync[] = "disable-gpu-vsync"; 28 const char kDisableGpuVsync[] = "disable-gpu-vsync";
26 29
27 // Turns on GPU logging (debug build only). 30 // Turns on GPU logging (debug build only).
28 const char kEnableGPUServiceLogging[] = "enable-gpu-service-logging"; 31 const char kEnableGPUServiceLogging[] = "enable-gpu-service-logging";
29 const char kEnableGPUClientLogging[] = "enable-gpu-client-logging"; 32 const char kEnableGPUClientLogging[] = "enable-gpu-client-logging";
30 33
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 const char kDisableGLDrawingForTests[] = "disable-gl-drawing-for-tests"; 68 const char kDisableGLDrawingForTests[] = "disable-gl-drawing-for-tests";
66 69
67 // Use hardware gpu, if available, for tests. 70 // Use hardware gpu, if available, for tests.
68 const char kUseGpuInTests[] = "use-gpu-in-tests"; 71 const char kUseGpuInTests[] = "use-gpu-in-tests";
69 72
70 // This is the list of switches passed from this file that are passed from the 73 // This is the list of switches passed from this file that are passed from the
71 // GpuProcessHost to the GPU Process. Add your switch to this list if you need 74 // GpuProcessHost to the GPU Process. Add your switch to this list if you need
72 // to read it in the GPU process, else don't add it. 75 // to read it in the GPU process, else don't add it.
73 const char* kGLSwitchesCopiedFromGpuProcessHost[] = { 76 const char* kGLSwitchesCopiedFromGpuProcessHost[] = {
74 kDisableGpuVsync, 77 kDisableGpuVsync,
78 kEnableD3D11,
75 kDisableD3D11, 79 kDisableD3D11,
76 kEnableGPUServiceLogging, 80 kEnableGPUServiceLogging,
77 kEnableGPUServiceTracing, 81 kEnableGPUServiceTracing,
78 kGpuNoContextLost, 82 kGpuNoContextLost,
79 }; 83 };
80 const int kGLSwitchesCopiedFromGpuProcessHostNumSwitches = 84 const int kGLSwitchesCopiedFromGpuProcessHostNumSwitches =
81 arraysize(kGLSwitchesCopiedFromGpuProcessHost); 85 arraysize(kGLSwitchesCopiedFromGpuProcessHost);
82 86
83 } // namespace switches 87 } // namespace switches
84 88
OLDNEW
« no previous file with comments | « ui/gl/gl_switches.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698