diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ui/gl/swap_chain_presenter.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ui/gl/swap_chain_presenter.cc')
| -rw-r--r-- | chromium/ui/gl/swap_chain_presenter.cc | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/chromium/ui/gl/swap_chain_presenter.cc b/chromium/ui/gl/swap_chain_presenter.cc index 40851d765bd..d5ba73d26a3 100644 --- a/chromium/ui/gl/swap_chain_presenter.cc +++ b/chromium/ui/gl/swap_chain_presenter.cc @@ -259,9 +259,12 @@ Microsoft::WRL::ComPtr<ID3D11Texture2D> SwapChainPresenter::UploadVideoImages( copy_texture_.Reset(); HRESULT hr = d3d11_device_->CreateTexture2D(&desc, nullptr, &staging_texture_); + base::UmaHistogramSparse( + "GPU.DirectComposition.UploadVideoImages.CreateStagingTexture", hr); if (FAILED(hr)) { DLOG(ERROR) << "Creating D3D11 video staging texture failed: " << std::hex << hr; + DirectCompositionSurfaceWin::DisableOverlays(); return nullptr; } DCHECK(staging_texture_); @@ -311,9 +314,12 @@ Microsoft::WRL::ComPtr<ID3D11Texture2D> SwapChainPresenter::UploadVideoImages( desc.BindFlags = D3D11_BIND_DECODER; desc.CPUAccessFlags = 0; HRESULT hr = d3d11_device_->CreateTexture2D(&desc, nullptr, ©_texture_); + base::UmaHistogramSparse( + "GPU.DirectComposition.UploadVideoImages.CreateCopyTexture", hr); if (FAILED(hr)) { DLOG(ERROR) << "Creating D3D11 video upload texture failed: " << std::hex << hr; + DirectCompositionSurfaceWin::DisableOverlays(); return nullptr; } DCHECK(copy_texture_); @@ -587,7 +593,11 @@ bool SwapChainPresenter::PresentToDecodeSwapChain( DCHECK(media_factory); DXGI_DECODE_SWAP_CHAIN_DESC desc = {}; - desc.Flags = 0; + // Set the DXGI_SWAP_CHAIN_FLAG_FULLSCREEN_VIDEO flag to mark this surface + // as a candidate for full screen video optimizations. If the surface + // does not qualify as fullscreen by DWM's logic then the flag will have + // no effects. + desc.Flags = DXGI_SWAP_CHAIN_FLAG_FULLSCREEN_VIDEO; HRESULT hr = media_factory->CreateDecodeSwapChainForCompositionSurfaceHandle( d3d11_device_.Get(), swap_chain_handle_.Get(), &desc, @@ -606,8 +616,8 @@ bool SwapChainPresenter::PresentToDecodeSwapChain( dcomp_device_.As(&desktop_device); DCHECK(desktop_device); - desktop_device->CreateSurfaceFromHandle(swap_chain_handle_.Get(), - &decode_surface_); + hr = desktop_device->CreateSurfaceFromHandle(swap_chain_handle_.Get(), + &decode_surface_); if (FAILED(hr)) { DLOG(ERROR) << "CreateSurfaceFromHandle failed with error 0x" << std::hex << hr; |