Remove the enable-d3d11 flag so that d3d11 is enabled by default.

BUG=258676
R=kbr@chromium.org

Review URL: https://codereview.chromium.org/177003009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259856 0039d316-1c4b-4281-b951-d872f2087c98
parent aee2f33c
...@@ -6148,12 +6148,6 @@ Keep your key file in a safe place. You will need it to create new versions of y ...@@ -6148,12 +6148,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_ENABLE_WEBGL_DESCRIPTION" desc="Description for the flag to enable WebGL."> <message name="IDS_FLAGS_ENABLE_WEBGL_DESCRIPTION" desc="Description for the flag to enable WebGL.">
Enabling this option allows web applications to access the WebGL API. Enabling this option allows web applications to access the WebGL API.
</message> </message>
<message name="IDS_FLAGS_ENABLE_D3D11_NAME" desc="Name of the 'Enable D3D11' lab.">
Enable D3D11
</message>
<message name="IDS_FLAGS_ENABLE_D3D11_DESCRIPTION" desc="Description for the flag to enable D3D11.">
Enabling this option allows the use of Direct3D 11 on configurations that support it.
</message>
<message name="IDS_FLAGS_ENABLE_WEBGL_DRAFT_EXTENSIONS_NAME" desc="Name of the 'Enable WebGL Draft Extensions' flag."> <message name="IDS_FLAGS_ENABLE_WEBGL_DRAFT_EXTENSIONS_NAME" desc="Name of the 'Enable WebGL Draft Extensions' flag.">
Enable WebGL Draft Extensions Enable WebGL Draft Extensions
</message> </message>
......
...@@ -528,13 +528,6 @@ const Experiment kExperiments[] = { ...@@ -528,13 +528,6 @@ const Experiment kExperiments[] = {
kOsAll, kOsAll,
SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL) SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL)
}, },
{
"enable-d3d11",
IDS_FLAGS_ENABLE_D3D11_NAME,
IDS_FLAGS_ENABLE_D3D11_DESCRIPTION,
kOsWin,
SINGLE_VALUE_TYPE(switches::kEnableD3D11)
},
{ {
"disable-webrtc", "disable-webrtc",
IDS_FLAGS_DISABLE_WEBRTC_NAME, IDS_FLAGS_DISABLE_WEBRTC_NAME,
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
"timeout": 30 "timeout": 30
} }
], ],
"revision": 2, "revision": 3,
"test_rect": [0, 0, 400, 300] "test_rect": [0, 0, 400, 300]
} }
] ]
......
...@@ -131,8 +131,7 @@ bool GLSurfaceEGL::InitializeOneOff() { ...@@ -131,8 +131,7 @@ bool GLSurfaceEGL::InitializeOneOff() {
g_native_display = base::MessagePumpForUI::GetDefaultXDisplay(); g_native_display = base::MessagePumpForUI::GetDefaultXDisplay();
#elif defined(OS_WIN) #elif defined(OS_WIN)
g_native_display = EGL_DEFAULT_DISPLAY; 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; g_native_display = EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE;
} }
#elif defined(USE_OZONE) #elif defined(USE_OZONE)
......
...@@ -18,9 +18,6 @@ const char kGLImplementationMockName[] = "mock"; ...@@ -18,9 +18,6 @@ const char kGLImplementationMockName[] = "mock";
namespace switches { namespace switches {
// Enables use of D3D11 when available.
const char kEnableD3D11[] = "enable-d3d11";
// Disables use of D3D11. // Disables use of D3D11.
const char kDisableD3D11[] = "disable-d3d11"; const char kDisableD3D11[] = "disable-d3d11";
...@@ -75,7 +72,6 @@ const char kUseGpuInTests[] = "use-gpu-in-tests"; ...@@ -75,7 +72,6 @@ const char kUseGpuInTests[] = "use-gpu-in-tests";
// to read it in the GPU process, else don't add it. // to read it in the GPU process, else don't add it.
const char* kGLSwitchesCopiedFromGpuProcessHost[] = { const char* kGLSwitchesCopiedFromGpuProcessHost[] = {
kDisableGpuVsync, kDisableGpuVsync,
kEnableD3D11,
kDisableD3D11, kDisableD3D11,
kEnableGPUServiceLogging, kEnableGPUServiceLogging,
kEnableGPUServiceTracing, kEnableGPUServiceTracing,
......
...@@ -23,7 +23,6 @@ extern const char kGLImplementationMockName[]; ...@@ -23,7 +23,6 @@ extern const char kGLImplementationMockName[];
namespace switches { namespace switches {
GL_EXPORT extern const char kEnableD3D11[];
GL_EXPORT extern const char kDisableD3D11[]; GL_EXPORT extern const char kDisableD3D11[];
GL_EXPORT extern const char kDisableGpuVsync[]; GL_EXPORT extern const char kDisableGpuVsync[];
GL_EXPORT extern const char kEnableGPUServiceLogging[]; GL_EXPORT extern const char kEnableGPUServiceLogging[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment