From d19d0cf8ee675221bddf39757850f57149e3e937 Mon Sep 17 00:00:00 2001 From: Austin Orion Date: Wed, 27 Jan 2021 09:40:21 -0800 Subject: [PATCH] Reland: Add ability to load CreateDirect3DDeviceFromDXGIDevice from d3d11.dll Relanding this after a build break in a downstream consumer caused a revert. I've removed the include of the windows.graphics.capture.interop header and instead replaced it with an include of windows.graphics.directx.direct3d11.h which is where the IDirect3DDevice data type that we need is declared. Before this was being included transitively through the WGC header, which was a mistake. Original change's description: Add ability to load CreateDirect3DDeviceFromDXGIDevice from d3d11.dll Creating a Direct3D11Device from a DXGIDevice is necessary for the new WGC based window capturer. However, the CreateDirect3DDeviceFromDXGIDevice API is not available on all versions of Windows, which means we have to load this function from d3d11.dll at runtime. You can see how this function will be used in this CL: 196624: Finish implementing WGC Window Capturer and add unit tests. | https://webrtc-review.googlesource.com/c/src/+/196624 I also ensure we don't leak HSTRINGs in GetActivationFactory and fix up some includes in ScopedComInitializer. Bug: webrtc:9273 Change-Id: I56a5eef29815a09297bd2cdad4c5e4265dd7e27e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/203200 Commit-Queue: Austin Orion Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#33081} --- rtc_base/BUILD.gn | 8 ++++ rtc_base/win/create_direct3d_device.cc | 57 ++++++++++++++++++++++++++ rtc_base/win/create_direct3d_device.h | 34 +++++++++++++++ rtc_base/win/get_activation_factory.h | 4 +- rtc_base/win/scoped_com_initializer.cc | 3 ++ rtc_base/win/scoped_com_initializer.h | 2 - 6 files changed, 105 insertions(+), 3 deletions(-) create mode 100644 rtc_base/win/create_direct3d_device.cc create mode 100644 rtc_base/win/create_direct3d_device.h diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 7af8e898d3..9c40c58983 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -140,6 +140,14 @@ rtc_library("rtc_base_approved") { data_deps = [ "//build/win:runtime_libs" ] } + # These files add a dependency on the Win10 SDK v10.0.10240. + if (rtc_enable_win_wgc) { + sources += [ + "win/create_direct3d_device.cc", + "win/create_direct3d_device.h", + ] + } + if (is_nacl) { public_deps += # no-presubmit-check TODO(webrtc:8603) [ "//native_client_sdk/src/libraries/nacl_io" ] diff --git a/rtc_base/win/create_direct3d_device.cc b/rtc_base/win/create_direct3d_device.cc new file mode 100644 index 0000000000..02fe340d56 --- /dev/null +++ b/rtc_base/win/create_direct3d_device.cc @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2020 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#include "rtc_base/win/create_direct3d_device.h" + +#include +#include + +namespace { + +FARPROC LoadD3D11Function(const char* function_name) { + static HMODULE const handle = + ::LoadLibraryExW(L"d3d11.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32); + return handle ? ::GetProcAddress(handle, function_name) : nullptr; +} + +decltype(&::CreateDirect3D11DeviceFromDXGIDevice) +GetCreateDirect3D11DeviceFromDXGIDevice() { + static decltype(&::CreateDirect3D11DeviceFromDXGIDevice) const function = + reinterpret_cast( + LoadD3D11Function("CreateDirect3D11DeviceFromDXGIDevice")); + return function; +} + +} // namespace + +namespace webrtc { + +bool ResolveCoreWinRTDirect3DDelayload() { + return GetCreateDirect3D11DeviceFromDXGIDevice(); +} + +HRESULT CreateDirect3DDeviceFromDXGIDevice( + IDXGIDevice* dxgi_device, + ABI::Windows::Graphics::DirectX::Direct3D11::IDirect3DDevice** + out_d3d11_device) { + decltype(&::CreateDirect3D11DeviceFromDXGIDevice) create_d3d11_device_func = + GetCreateDirect3D11DeviceFromDXGIDevice(); + if (!create_d3d11_device_func) + return E_FAIL; + + Microsoft::WRL::ComPtr inspectableSurface; + HRESULT hr = create_d3d11_device_func(dxgi_device, &inspectableSurface); + if (FAILED(hr)) + return hr; + + return inspectableSurface->QueryInterface(IID_PPV_ARGS(out_d3d11_device)); +} + +} // namespace webrtc diff --git a/rtc_base/win/create_direct3d_device.h b/rtc_base/win/create_direct3d_device.h new file mode 100644 index 0000000000..7c21f8720a --- /dev/null +++ b/rtc_base/win/create_direct3d_device.h @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2020 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#ifndef RTC_BASE_WIN_CREATE_DIRECT3D_DEVICE_H_ +#define RTC_BASE_WIN_CREATE_DIRECT3D_DEVICE_H_ + +#include +#include +#include +#include + +namespace webrtc { + +// Callers must check the return value of ResolveCoreWinRTDirect3DDelayload() +// before using CreateDirect3DDeviceFromDXGIDevice(). +bool ResolveCoreWinRTDirect3DDelayload(); + +// Allows for the creating of Direct3D Devices from a DXGI device on versions +// of Windows greater than Win7. +HRESULT CreateDirect3DDeviceFromDXGIDevice( + IDXGIDevice* dxgi_device, + ABI::Windows::Graphics::DirectX::Direct3D11::IDirect3DDevice** + out_d3d11_device); + +} // namespace webrtc + +#endif // RTC_BASE_WIN_CREATE_DIRECT3D_DEVICE_H_ diff --git a/rtc_base/win/get_activation_factory.h b/rtc_base/win/get_activation_factory.h index 801f39d313..08f602f0c4 100644 --- a/rtc_base/win/get_activation_factory.h +++ b/rtc_base/win/get_activation_factory.h @@ -40,8 +40,10 @@ HRESULT GetActivationFactory(InterfaceType** factory) { return hr; hr = RoGetActivationFactoryProxy(class_id_hstring, IID_PPV_ARGS(factory)); - if (FAILED(hr)) + if (FAILED(hr)) { + DeleteHstring(class_id_hstring); return hr; + } return DeleteHstring(class_id_hstring); } diff --git a/rtc_base/win/scoped_com_initializer.cc b/rtc_base/win/scoped_com_initializer.cc index b83ad32a67..81079fb54c 100644 --- a/rtc_base/win/scoped_com_initializer.cc +++ b/rtc_base/win/scoped_com_initializer.cc @@ -10,6 +10,9 @@ #include "rtc_base/win/scoped_com_initializer.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" + namespace webrtc { ScopedCOMInitializer::ScopedCOMInitializer() { diff --git a/rtc_base/win/scoped_com_initializer.h b/rtc_base/win/scoped_com_initializer.h index 918812fc72..2427097b5b 100644 --- a/rtc_base/win/scoped_com_initializer.h +++ b/rtc_base/win/scoped_com_initializer.h @@ -13,8 +13,6 @@ #include -#include "rtc_base/logging.h" - namespace webrtc { // Initializes COM in the constructor (STA or MTA), and uninitializes COM in the