OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "content/public/browser/gpu_utils.h" | 5 #include "content/public/browser/gpu_utils.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
9 #include "content/public/common/content_switches.h" | 9 #include "content/public/common/content_switches.h" |
10 #include "gpu/command_buffer/service/gpu_switches.h" | 10 #include "gpu/command_buffer/service/gpu_switches.h" |
(...skipping 30 matching lines...) Expand all Loading... | |
41 command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); | 41 command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); |
42 #if defined(OS_CHROMEOS) | 42 #if defined(OS_CHROMEOS) |
43 gpu_preferences.disable_vaapi_accelerated_video_encode = | 43 gpu_preferences.disable_vaapi_accelerated_video_encode = |
44 command_line->HasSwitch(switches::kDisableVaapiAcceleratedVideoEncode); | 44 command_line->HasSwitch(switches::kDisableVaapiAcceleratedVideoEncode); |
45 #endif | 45 #endif |
46 #if defined(ENABLE_WEBRTC) | 46 #if defined(ENABLE_WEBRTC) |
47 gpu_preferences.disable_web_rtc_hw_encoding = | 47 gpu_preferences.disable_web_rtc_hw_encoding = |
48 command_line->HasSwitch(switches::kDisableWebRtcHWEncoding); | 48 command_line->HasSwitch(switches::kDisableWebRtcHWEncoding); |
49 #endif | 49 #endif |
50 #if defined(OS_WIN) | 50 #if defined(OS_WIN) |
51 gpu_preferences.enable_accelerated_vpx_decode = true; | 51 uint32_t enable_accelerated_vpx_decode_val = |
jbauman
2016/08/22 18:20:49
This needs to be VPX_VENDOR_MICROSOFT.
| |
52 uint32_t enable_vpx_decode; | 52 gpu::GpuPreferences::VPX_VENDOR_NONE; |
53 if (GetUintFromSwitch(command_line, switches::kEnableAcceleratedVpxDecode, | 53 if (GetUintFromSwitch(command_line, switches::kEnableAcceleratedVpxDecode, |
54 &enable_vpx_decode)) { | 54 &enable_accelerated_vpx_decode_val)) { |
55 gpu_preferences.enable_accelerated_vpx_decode = !!enable_vpx_decode; | 55 gpu_preferences.enable_accelerated_vpx_decode = |
56 static_cast<gpu::GpuPreferences::VpxDecodeVendors>( | |
57 enable_accelerated_vpx_decode_val); | |
56 } | 58 } |
57 gpu_preferences.enable_zero_copy_dxgi_video = | 59 gpu_preferences.enable_zero_copy_dxgi_video = |
58 !command_line->HasSwitch(switches::kDisableZeroCopyDxgiVideo); | 60 !command_line->HasSwitch(switches::kDisableZeroCopyDxgiVideo); |
59 gpu_preferences.enable_nv12_dxgi_video = | 61 gpu_preferences.enable_nv12_dxgi_video = |
60 !command_line->HasSwitch(switches::kDisableNv12DxgiVideo); | 62 !command_line->HasSwitch(switches::kDisableNv12DxgiVideo); |
61 #endif | 63 #endif |
62 gpu_preferences.compile_shader_always_succeeds = | 64 gpu_preferences.compile_shader_always_succeeds = |
63 command_line->HasSwitch(switches::kCompileShaderAlwaysSucceeds); | 65 command_line->HasSwitch(switches::kCompileShaderAlwaysSucceeds); |
64 gpu_preferences.disable_gl_error_limit = | 66 gpu_preferences.disable_gl_error_limit = |
65 command_line->HasSwitch(switches::kDisableGLErrorLimit); | 67 command_line->HasSwitch(switches::kDisableGLErrorLimit); |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
102 gpu_preferences.enable_gpu_service_tracing = | 104 gpu_preferences.enable_gpu_service_tracing = |
103 command_line->HasSwitch(switches::kEnableGPUServiceTracing); | 105 command_line->HasSwitch(switches::kEnableGPUServiceTracing); |
104 gpu_preferences.enable_unsafe_es3_apis = | 106 gpu_preferences.enable_unsafe_es3_apis = |
105 command_line->HasSwitch(switches::kEnableUnsafeES3APIs); | 107 command_line->HasSwitch(switches::kEnableUnsafeES3APIs); |
106 gpu_preferences.use_passthrough_cmd_decoder = | 108 gpu_preferences.use_passthrough_cmd_decoder = |
107 command_line->HasSwitch(switches::kUsePassthroughCmdDecoder); | 109 command_line->HasSwitch(switches::kUsePassthroughCmdDecoder); |
108 return gpu_preferences; | 110 return gpu_preferences; |
109 } | 111 } |
110 | 112 |
111 } // namespace content | 113 } // namespace content |
OLD | NEW |