Chromium Code Reviews| Index: webrtc/modules/desktop_capture/win/d3d_device.cc |
| diff --git a/webrtc/modules/desktop_capture/win/d3d_device.cc b/webrtc/modules/desktop_capture/win/d3d_device.cc |
| index 67d12980787c68707abea63a5c3ebf2e68f055cf..078c0c4295f7b87eb279521acbe626dc1d274824 100644 |
| --- a/webrtc/modules/desktop_capture/win/d3d_device.cc |
| +++ b/webrtc/modules/desktop_capture/win/d3d_device.cc |
| @@ -31,6 +31,7 @@ bool D3dDevice::Initialize(const ComPtr<IDXGIAdapter>& adapter) { |
| } |
| D3D_FEATURE_LEVEL feature_level; |
| + // Default feature levels contain D3D 9.1 through D3D 11.0. |
| _com_error error = D3D11CreateDevice( |
| adapter.Get(), D3D_DRIVER_TYPE_UNKNOWN, nullptr, |
| D3D11_CREATE_DEVICE_BGRA_SUPPORT | D3D11_CREATE_DEVICE_SINGLETHREADED, |
| @@ -44,16 +45,18 @@ bool D3dDevice::Initialize(const ComPtr<IDXGIAdapter>& adapter) { |
| if (feature_level < D3D_FEATURE_LEVEL_11_0) { |
|
Sergey Ulanov
2016/11/07 19:37:16
Do we need this check at all? Maybe just log featu
Hzj_jie
2016/11/08 01:25:39
Indeed I cannot quite tell whether the following d
|
| LOG(LS_WARNING) << "D3D11CreateDevice returns an instance without DirectX " |
| - "11 support, level " |
| - << feature_level; |
| - return false; |
| + "11 support, level " << feature_level |
| + << ". Following initialization may fail."; |
| + // D3D_FEATURE_LEVEL_11_0 is not officially documented on MSDN to be a |
| + // requirement of Dxgi duplicator APIs. |
| } |
| error = d3d_device_.As(&dxgi_device_); |
| if (error.Error() != S_OK || !dxgi_device_) { |
| LOG(LS_WARNING) << "ID3D11Device is not an implementation of IDXGIDevice, " |
| "this usually means the system does not support DirectX " |
| - "11"; |
| + "11. Error " |
| + << error.ErrorMessage() << " with code " << error.Error(); |
| return false; |
| } |