Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1867700 - Add workaround for SwapChain Present() of RenderCompositorANGLE on Windows r=gfx-reviewers,lsalzman

Browse Source 
Implement a workaround of framebuffer's SwapChain Present() that exists in chromium.

Differential Revision: https://phabricator.services.mozilla.com/D195201
This commit is contained in:
sotaro 2023-12-19 00:38:32 +00:00
parent f79111c182
commit 38db0ec252
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gfx/webrender_bindings/RenderCompositorANGLE.cpp
View File

@ -197,6 +197,7 @@ HWND RenderCompositorANGLE::GetCompositorHwnd() {
bool RenderCompositorANGLE::CreateSwapChain(nsACString& aError) {
MOZ_ASSERT(!UseCompositor());
mFirstPresent = true;
HWND hwnd = mWidget->AsWindows()->GetHwnd();
RefPtr<IDXGIDevice> dxgiDevice;
@ -449,6 +450,14 @@ RenderedFrameId RenderCompositorANGLE::EndFrame(
}
}
const UINT interval =
mFirstPresent ||
StaticPrefs::
gfx_webrender_dcomp_video_swap_chain_present_interval_0()
? 0
: 1;
const UINT flags = 0;
const LayoutDeviceIntSize& bufferSize = mBufferSize.ref();
if (mUsePartialPresent && mSwapChain1) {
// Clear full render flag.
@ -483,7 +492,7 @@ RenderedFrameId RenderCompositorANGLE::EndFrame(
params.pDirtyRects = rects.data();
HRESULT hr;
hr = mSwapChain1->Present1(0, 0, &params);
hr = mSwapChain1->Present1(interval, flags, &params);
if (FAILED(hr) && hr != DXGI_STATUS_OCCLUDED) {
gfxCriticalNote << "Present1 failed: " << gfx::hexa(hr);
mFullRender = true;
@ -491,11 +500,31 @@ RenderedFrameId RenderCompositorANGLE::EndFrame(
}
}
} else {
mSwapChain->Present(0, 0);
mSwapChain->Present(interval, flags);
}
auto end = TimeStamp::Now();
mozilla::Telemetry::Accumulate(mozilla::Telemetry::COMPOSITE_SWAP_TIME,
(end - start).ToMilliseconds() * 10.);
if (mFirstPresent && mDCLayerTree) {
// Wait for the GPU to finish executing its commands before
// committing the DirectComposition tree, or else the swapchain
// may flicker black when it's first presented.
RefPtr<IDXGIDevice2> dxgiDevice2;
mDevice->QueryInterface((IDXGIDevice2**)getter_AddRefs(dxgiDevice2));
MOZ_ASSERT(dxgiDevice2);
HANDLE event = ::CreateEvent(nullptr, false, false, nullptr);
HRESULT hr = dxgiDevice2->EnqueueSetEvent(event);
if (SUCCEEDED(hr)) {
DebugOnly<DWORD> result = ::WaitForSingleObject(event, INFINITE);
MOZ_ASSERT(result == WAIT_OBJECT_0);
} else {
gfxCriticalNoteOnce << "EnqueueSetEvent failed: " << gfx::hexa(hr);
}
::CloseHandle(event);
}
mFirstPresent = false;
}
if (mDisablingNativeCompositor) {

1
gfx/webrender_bindings/RenderCompositorANGLE.h
View File

@ -151,6 +151,7 @@ class RenderCompositorANGLE : public RenderCompositor {
bool mFullRender = false;
// Used to know a timing of disabling native compositor.
bool mDisablingNativeCompositor = false;
bool mFirstPresent = true;
};
} // namespace wr