| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/browser/gpu/gpu_data_manager_impl_private.h" | 5 #include "content/browser/gpu/gpu_data_manager_impl_private.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <iterator> | 8 #include <iterator> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 794 gpu_driver_bugs_.end()) { | 794 gpu_driver_bugs_.end()) { |
| 795 command_line->AppendSwitch(switches::kCreateDefaultGLContext); | 795 command_line->AppendSwitch(switches::kCreateDefaultGLContext); |
| 796 } | 796 } |
| 797 | 797 |
| 798 #if defined(USE_OZONE) | 798 #if defined(USE_OZONE) |
| 799 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 799 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 800 switches::kEnableDrmAtomic)) { | 800 switches::kEnableDrmAtomic)) { |
| 801 command_line->AppendSwitch(switches::kEnableDrmAtomic); | 801 command_line->AppendSwitch(switches::kEnableDrmAtomic); |
| 802 } | 802 } |
| 803 #endif | 803 #endif |
| 804 #if defined(OS_WIN) | |
| 805 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VPX_DECODE) && | |
| 806 gpu_preferences) { | |
| 807 gpu_preferences->enable_accelerated_vpx_decode = | |
| 808 gpu::GpuPreferences::VPX_VENDOR_NONE; | |
| 809 } | |
| 810 #endif | |
| 811 | 804 |
| 812 if (gpu_preferences) { // enable_es3_apis | 805 if (gpu_preferences) { // enable_es3_apis |
| 813 bool blacklisted = IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL2); | 806 bool blacklisted = IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL2); |
| 814 bool enabled = base::CommandLine::ForCurrentProcess()->HasSwitch( | 807 bool enabled = base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 815 switches::kEnableES3APIs); | 808 switches::kEnableES3APIs); |
| 816 bool disabled = base::CommandLine::ForCurrentProcess()->HasSwitch( | 809 bool disabled = base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 817 switches::kDisableES3APIs); | 810 switches::kDisableES3APIs); |
| 818 gpu_preferences->enable_es3_apis = (enabled || !blacklisted) && !disabled; | 811 gpu_preferences->enable_es3_apis = (enabled || !blacklisted) && !disabled; |
| 819 } | 812 } |
| 820 | 813 |
| (...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1384 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; | 1377 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; |
| 1385 #if defined(OS_WIN) | 1378 #if defined(OS_WIN) |
| 1386 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; | 1379 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; |
| 1387 #endif | 1380 #endif |
| 1388 complete_gpu_info_already_requested_ = true; | 1381 complete_gpu_info_already_requested_ = true; |
| 1389 // Some observers might be waiting. | 1382 // Some observers might be waiting. |
| 1390 NotifyGpuInfoUpdate(); | 1383 NotifyGpuInfoUpdate(); |
| 1391 } | 1384 } |
| 1392 | 1385 |
| 1393 } // namespace content | 1386 } // namespace content |
| OLD | NEW |