2016-05-05 08:00:13 +03:00
|
|
|
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
|
2016-07-01 11:15:16 +03:00
|
|
|
#include "WinCompositorWidget.h"
|
2019-05-26 17:31:53 +03:00
|
|
|
|
2019-07-26 04:10:23 +03:00
|
|
|
#include "mozilla/StaticPrefs_layers.h"
|
2016-08-24 01:18:55 +03:00
|
|
|
#include "mozilla/gfx/DeviceManagerDx.h"
|
2016-05-05 08:00:14 +03:00
|
|
|
#include "mozilla/gfx/Point.h"
|
2016-08-24 01:18:55 +03:00
|
|
|
#include "mozilla/layers/Compositor.h"
|
2019-10-08 13:07:47 +03:00
|
|
|
#include "mozilla/layers/CompositorThread.h"
|
|
|
|
#include "mozilla/webrender/RenderThread.h"
|
2016-07-01 11:15:16 +03:00
|
|
|
#include "mozilla/widget/PlatformWidgetTypes.h"
|
2016-07-19 21:56:07 +03:00
|
|
|
#include "nsWindow.h"
|
|
|
|
#include "VsyncDispatcher.h"
|
2018-03-29 05:21:47 +03:00
|
|
|
#include "WinCompositorWindowThread.h"
|
2019-09-04 22:58:51 +03:00
|
|
|
#include "VRShMem.h"
|
2016-05-05 08:00:13 +03:00
|
|
|
|
2016-08-24 01:18:55 +03:00
|
|
|
#include <ddraw.h>
|
|
|
|
|
2016-05-05 08:00:13 +03:00
|
|
|
namespace mozilla {
|
|
|
|
namespace widget {
|
|
|
|
|
2016-05-05 08:00:14 +03:00
|
|
|
using namespace mozilla::gfx;
|
2018-06-21 23:17:48 +03:00
|
|
|
using namespace mozilla;
|
2016-05-05 08:00:14 +03:00
|
|
|
|
Bug 1373739 - Make headless compositing Windows-compatible, in addition to Linux. r=dvander
To make the HeadlessCompositorWidget work under Windows as well as Linux, I had
to change the way that I hooked it into the existing CompositorWidget system.
Under GTK, the CompositorWidgetInitData and CompositorWidgetDelegate types
provided the information needed by the headless compositor widget already (the
widget client size). On Windows, however, the definitions of these types
differ, and the client size information is simply retrieved from the platform
APIs when needed.
After this patch, CompositorWidgetDelegate is renamed to
PlatformCompositorWidgetDelegate, and a new base class called
CompositorWidgetDelegate is added with "AsPlatformSpecificDelegate()" and
"AsHeadlessCompositorWidget()" methods. In non-headless mode, widgets use
AsPlatformSpecificDelegate() to access the Windows- and GTK-specific delegate
APIs. In headless mode, AsHeadlessCompositorWidget() is used to access the
singular CompositorWidget implementation for headless. Meanwhile, the
CompositorWidgetInitData IPDL type is made into a union which always contains a
headless-specific HeadlessCompositorWidgetInitData struct and under GTK and
Windows also contains an {X11,Win}CompositorWidgetInitData struct.
This also includes a small patch to ensure that the GPU process and
hardware-accelerated compositing are always disabled under headless mode. These
features weren't activated by default in the Linux environments I tested in, but
did end up activating (and then promptly crashing Firefox) when I tested on
Windows.
MozReview-Commit-ID: CocPoHBDV7H
--HG--
extra : rebase_source : 4581fa63aa3a9f32a8dc2672015a35b9be01b20f
2017-07-07 03:45:34 +03:00
|
|
|
WinCompositorWidget::WinCompositorWidget(
|
|
|
|
const WinCompositorWidgetInitData& aInitData,
|
2017-01-13 01:29:42 +03:00
|
|
|
const layers::CompositorOptions& aOptions)
|
|
|
|
: CompositorWidget(aOptions),
|
2019-11-01 14:01:34 +03:00
|
|
|
mSetParentCompleted(false),
|
2017-01-13 01:29:42 +03:00
|
|
|
mWidgetKey(aInitData.widgetKey()),
|
2016-07-01 11:15:16 +03:00
|
|
|
mWnd(reinterpret_cast<HWND>(aInitData.hWnd())),
|
2020-01-06 21:12:38 +03:00
|
|
|
mCompositorWnds(nullptr, nullptr),
|
|
|
|
mTransparentSurfaceLock("mTransparentSurfaceLock"),
|
|
|
|
mTransparencyMode(aInitData.transparencyMode()),
|
|
|
|
mMemoryDC(nullptr),
|
|
|
|
mCompositeDC(nullptr),
|
|
|
|
mLockedBackBufferData(nullptr) {
|
2016-05-05 08:00:13 +03:00
|
|
|
MOZ_ASSERT(mWnd && ::IsWindow(mWnd));
|
2020-01-06 21:12:38 +03:00
|
|
|
|
|
|
|
// mNotDeferEndRemoteDrawing is set on the main thread during init,
|
|
|
|
// but is only accessed after on the compositor thread.
|
|
|
|
mNotDeferEndRemoteDrawing =
|
|
|
|
StaticPrefs::layers_offmainthreadcomposition_frame_rate() == 0 ||
|
|
|
|
gfxPlatform::IsInLayoutAsapMode() || gfxPlatform::ForceSoftwareVsync();
|
2016-05-05 08:00:13 +03:00
|
|
|
}
|
|
|
|
|
2018-03-29 05:21:47 +03:00
|
|
|
WinCompositorWidget::~WinCompositorWidget() { DestroyCompositorWindow(); }
|
|
|
|
|
2020-01-06 21:12:38 +03:00
|
|
|
void WinCompositorWidget::OnDestroyWindow() {
|
|
|
|
MutexAutoLock lock(mTransparentSurfaceLock);
|
|
|
|
mTransparentSurface = nullptr;
|
|
|
|
mMemoryDC = nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool WinCompositorWidget::PreRender(WidgetRenderingContext* aContext) {
|
|
|
|
// This can block waiting for WM_SETTEXT to finish
|
|
|
|
// Using PreRender is unnecessarily pessimistic because
|
|
|
|
// we technically only need to block during the present call
|
|
|
|
// not all of compositor rendering
|
|
|
|
mPresentLock.Enter();
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void WinCompositorWidget::PostRender(WidgetRenderingContext* aContext) {
|
|
|
|
mPresentLock.Leave();
|
|
|
|
}
|
|
|
|
|
|
|
|
LayoutDeviceIntSize WinCompositorWidget::GetClientSize() {
|
|
|
|
RECT r;
|
|
|
|
if (!::GetClientRect(mWnd, &r)) {
|
|
|
|
return LayoutDeviceIntSize();
|
|
|
|
}
|
|
|
|
return LayoutDeviceIntSize(r.right - r.left, r.bottom - r.top);
|
|
|
|
}
|
|
|
|
|
|
|
|
already_AddRefed<gfx::DrawTarget> WinCompositorWidget::StartRemoteDrawing() {
|
|
|
|
MutexAutoLock lock(mTransparentSurfaceLock);
|
|
|
|
|
|
|
|
MOZ_ASSERT(!mCompositeDC);
|
|
|
|
|
|
|
|
RefPtr<gfxASurface> surf;
|
|
|
|
if (mTransparencyMode == eTransparencyTransparent) {
|
|
|
|
surf = EnsureTransparentSurface();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Must call this after EnsureTransparentSurface(), since it could update
|
|
|
|
// the DC.
|
|
|
|
HDC dc = GetWindowSurface();
|
|
|
|
if (!surf) {
|
|
|
|
if (!dc) {
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
uint32_t flags = (mTransparencyMode == eTransparencyOpaque)
|
|
|
|
? 0
|
|
|
|
: gfxWindowsSurface::FLAG_IS_TRANSPARENT;
|
|
|
|
surf = new gfxWindowsSurface(dc, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
IntSize size = surf->GetSize();
|
|
|
|
if (size.width <= 0 || size.height <= 0) {
|
|
|
|
if (dc) {
|
|
|
|
FreeWindowSurface(dc);
|
|
|
|
}
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
RefPtr<DrawTarget> dt =
|
|
|
|
mozilla::gfx::Factory::CreateDrawTargetForCairoSurface(
|
|
|
|
surf->CairoSurface(), size);
|
|
|
|
if (dt) {
|
|
|
|
mCompositeDC = dc;
|
|
|
|
} else {
|
|
|
|
FreeWindowSurface(dc);
|
|
|
|
}
|
|
|
|
|
|
|
|
return dt.forget();
|
|
|
|
}
|
|
|
|
|
|
|
|
void WinCompositorWidget::EndRemoteDrawing() {
|
|
|
|
MOZ_ASSERT(!mLockedBackBufferData);
|
|
|
|
|
|
|
|
if (mTransparencyMode == eTransparencyTransparent) {
|
|
|
|
MOZ_ASSERT(mTransparentSurface);
|
|
|
|
RedrawTransparentWindow();
|
|
|
|
}
|
|
|
|
if (mCompositeDC) {
|
|
|
|
FreeWindowSurface(mCompositeDC);
|
|
|
|
}
|
|
|
|
mCompositeDC = nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool WinCompositorWidget::NeedsToDeferEndRemoteDrawing() {
|
|
|
|
if (mNotDeferEndRemoteDrawing) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
IDirectDraw7* ddraw = DeviceManagerDx::Get()->GetDirectDraw();
|
|
|
|
if (!ddraw) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
DWORD scanLine = 0;
|
|
|
|
int height = ::GetSystemMetrics(SM_CYSCREEN);
|
|
|
|
HRESULT ret = ddraw->GetScanLine(&scanLine);
|
|
|
|
if (ret == DDERR_VERTICALBLANKINPROGRESS) {
|
|
|
|
scanLine = 0;
|
|
|
|
} else if (ret != DD_OK) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check if there is a risk of tearing with GDI.
|
|
|
|
if (static_cast<int>(scanLine) > height / 2) {
|
|
|
|
// No need to defer.
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
already_AddRefed<gfx::DrawTarget> WinCompositorWidget::GetBackBufferDrawTarget(
|
|
|
|
gfx::DrawTarget* aScreenTarget, const gfx::IntRect& aRect,
|
|
|
|
bool* aOutIsCleared) {
|
|
|
|
MOZ_ASSERT(!mLockedBackBufferData);
|
|
|
|
|
|
|
|
RefPtr<gfx::DrawTarget> target = CompositorWidget::GetBackBufferDrawTarget(
|
|
|
|
aScreenTarget, aRect, aOutIsCleared);
|
|
|
|
if (!target) {
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
MOZ_ASSERT(target->GetBackendType() == BackendType::CAIRO);
|
|
|
|
|
|
|
|
uint8_t* destData;
|
|
|
|
IntSize destSize;
|
|
|
|
int32_t destStride;
|
|
|
|
SurfaceFormat destFormat;
|
|
|
|
if (!target->LockBits(&destData, &destSize, &destStride, &destFormat)) {
|
|
|
|
// LockBits is not supported. Use original DrawTarget.
|
|
|
|
return target.forget();
|
|
|
|
}
|
|
|
|
|
|
|
|
RefPtr<gfx::DrawTarget> dataTarget = Factory::CreateDrawTargetForData(
|
|
|
|
BackendType::CAIRO, destData, destSize, destStride, destFormat);
|
|
|
|
mLockedBackBufferData = destData;
|
|
|
|
|
|
|
|
return dataTarget.forget();
|
|
|
|
}
|
|
|
|
|
|
|
|
already_AddRefed<gfx::SourceSurface>
|
|
|
|
WinCompositorWidget::EndBackBufferDrawing() {
|
|
|
|
if (mLockedBackBufferData) {
|
|
|
|
MOZ_ASSERT(mLastBackBuffer);
|
|
|
|
mLastBackBuffer->ReleaseBits(mLockedBackBufferData);
|
|
|
|
mLockedBackBufferData = nullptr;
|
|
|
|
}
|
|
|
|
return CompositorWidget::EndBackBufferDrawing();
|
|
|
|
}
|
|
|
|
|
|
|
|
bool WinCompositorWidget::InitCompositor(layers::Compositor* aCompositor) {
|
|
|
|
if (aCompositor->GetBackendType() == layers::LayersBackend::LAYERS_BASIC) {
|
|
|
|
DeviceManagerDx::Get()->InitializeDirectDraw();
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2016-07-01 11:15:16 +03:00
|
|
|
uintptr_t WinCompositorWidget::GetWidgetKey() { return mWidgetKey; }
|
2016-05-05 08:00:14 +03:00
|
|
|
|
2020-01-06 21:12:38 +03:00
|
|
|
void WinCompositorWidget::EnterPresentLock() { mPresentLock.Enter(); }
|
|
|
|
|
|
|
|
void WinCompositorWidget::LeavePresentLock() { mPresentLock.Leave(); }
|
|
|
|
|
|
|
|
RefPtr<gfxASurface> WinCompositorWidget::EnsureTransparentSurface() {
|
|
|
|
mTransparentSurfaceLock.AssertCurrentThreadOwns();
|
|
|
|
MOZ_ASSERT(mTransparencyMode == eTransparencyTransparent);
|
|
|
|
|
|
|
|
IntSize size = GetClientSize().ToUnknownSize();
|
|
|
|
if (!mTransparentSurface || mTransparentSurface->GetSize() != size) {
|
|
|
|
mTransparentSurface = nullptr;
|
|
|
|
mMemoryDC = nullptr;
|
|
|
|
CreateTransparentSurface(size);
|
|
|
|
}
|
|
|
|
|
|
|
|
RefPtr<gfxASurface> surface = mTransparentSurface;
|
|
|
|
return surface.forget();
|
|
|
|
}
|
|
|
|
|
|
|
|
void WinCompositorWidget::CreateTransparentSurface(const gfx::IntSize& aSize) {
|
|
|
|
mTransparentSurfaceLock.AssertCurrentThreadOwns();
|
|
|
|
MOZ_ASSERT(!mTransparentSurface && !mMemoryDC);
|
|
|
|
RefPtr<gfxWindowsSurface> surface =
|
|
|
|
new gfxWindowsSurface(aSize, SurfaceFormat::A8R8G8B8_UINT32);
|
|
|
|
mTransparentSurface = surface;
|
|
|
|
mMemoryDC = surface->GetDC();
|
|
|
|
}
|
|
|
|
|
|
|
|
void WinCompositorWidget::UpdateTransparency(nsTransparencyMode aMode) {
|
|
|
|
MutexAutoLock lock(mTransparentSurfaceLock);
|
|
|
|
if (mTransparencyMode == aMode) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
mTransparencyMode = aMode;
|
|
|
|
mTransparentSurface = nullptr;
|
|
|
|
mMemoryDC = nullptr;
|
|
|
|
|
|
|
|
if (mTransparencyMode == eTransparencyTransparent) {
|
|
|
|
EnsureTransparentSurface();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
bool WinCompositorWidget::HasGlass() const {
|
|
|
|
MOZ_ASSERT(layers::CompositorThreadHolder::IsInCompositorThread() ||
|
|
|
|
wr::RenderThread::IsInRenderThread());
|
|
|
|
|
|
|
|
nsTransparencyMode transparencyMode = mTransparencyMode;
|
|
|
|
return transparencyMode == eTransparencyGlass ||
|
|
|
|
transparencyMode == eTransparencyBorderlessGlass;
|
|
|
|
}
|
|
|
|
|
|
|
|
void WinCompositorWidget::ClearTransparentWindow() {
|
|
|
|
MutexAutoLock lock(mTransparentSurfaceLock);
|
|
|
|
if (!mTransparentSurface) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
EnsureTransparentSurface();
|
|
|
|
|
|
|
|
IntSize size = mTransparentSurface->GetSize();
|
|
|
|
if (!size.IsEmpty()) {
|
|
|
|
RefPtr<DrawTarget> drawTarget =
|
|
|
|
gfxPlatform::CreateDrawTargetForSurface(mTransparentSurface, size);
|
|
|
|
if (!drawTarget) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
drawTarget->ClearRect(Rect(0, 0, size.width, size.height));
|
|
|
|
RedrawTransparentWindow();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
bool WinCompositorWidget::RedrawTransparentWindow() {
|
|
|
|
MOZ_ASSERT(mTransparencyMode == eTransparencyTransparent);
|
|
|
|
|
|
|
|
LayoutDeviceIntSize size = GetClientSize();
|
|
|
|
|
|
|
|
::GdiFlush();
|
|
|
|
|
|
|
|
BLENDFUNCTION bf = {AC_SRC_OVER, 0, 255, AC_SRC_ALPHA};
|
|
|
|
SIZE winSize = {size.width, size.height};
|
|
|
|
POINT srcPos = {0, 0};
|
|
|
|
HWND hWnd = WinUtils::GetTopLevelHWND(mWnd, true);
|
|
|
|
RECT winRect;
|
|
|
|
::GetWindowRect(hWnd, &winRect);
|
|
|
|
|
|
|
|
// perform the alpha blend
|
|
|
|
return !!::UpdateLayeredWindow(hWnd, nullptr, (POINT*)&winRect, &winSize,
|
|
|
|
mMemoryDC, &srcPos, 0, &bf, ULW_ALPHA);
|
|
|
|
}
|
|
|
|
|
|
|
|
HDC WinCompositorWidget::GetWindowSurface() {
|
|
|
|
return eTransparencyTransparent == mTransparencyMode ? mMemoryDC
|
|
|
|
: ::GetDC(mWnd);
|
|
|
|
}
|
|
|
|
|
|
|
|
void WinCompositorWidget::FreeWindowSurface(HDC dc) {
|
|
|
|
if (eTransparencyTransparent != mTransparencyMode) ::ReleaseDC(mWnd, dc);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool WinCompositorWidget::IsHidden() const { return ::IsIconic(mWnd); }
|
|
|
|
|
2018-03-29 05:21:47 +03:00
|
|
|
void WinCompositorWidget::EnsureCompositorWindow() {
|
2019-02-07 10:01:41 +03:00
|
|
|
if (mCompositorWnds.mCompositorWnd || mCompositorWnds.mInitialParentWnd) {
|
2018-03-29 05:21:47 +03:00
|
|
|
return;
|
|
|
|
}
|
2019-02-07 10:01:41 +03:00
|
|
|
|
|
|
|
mCompositorWnds = WinCompositorWindowThread::CreateCompositorWindow();
|
|
|
|
UpdateCompositorWnd(mCompositorWnds.mCompositorWnd, mWnd);
|
|
|
|
|
|
|
|
MOZ_ASSERT(mCompositorWnds.mCompositorWnd);
|
|
|
|
MOZ_ASSERT(mCompositorWnds.mInitialParentWnd);
|
2018-03-29 05:21:47 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void WinCompositorWidget::DestroyCompositorWindow() {
|
2019-02-07 10:01:41 +03:00
|
|
|
if (!mCompositorWnds.mCompositorWnd && !mCompositorWnds.mInitialParentWnd) {
|
2018-03-29 05:21:47 +03:00
|
|
|
return;
|
|
|
|
}
|
2019-02-07 10:01:41 +03:00
|
|
|
WinCompositorWindowThread::DestroyCompositorWindow(mCompositorWnds);
|
|
|
|
mCompositorWnds = WinCompositorWnds(nullptr, nullptr);
|
2018-03-29 05:21:47 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void WinCompositorWidget::UpdateCompositorWndSizeIfNecessary() {
|
2019-02-07 10:01:41 +03:00
|
|
|
if (!mCompositorWnds.mCompositorWnd) {
|
2018-03-29 05:21:47 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
LayoutDeviceIntSize size = GetClientSize();
|
|
|
|
if (mLastCompositorWndSize == size) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-11-01 14:01:34 +03:00
|
|
|
// This code is racing with the compositor, which needs to reparent
|
|
|
|
// the compositor surface to the actual window (mWnd). To avoid racing
|
|
|
|
// mutations, we refuse to proceed until ::SetParent() is called in parent
|
|
|
|
// process. After the ::SetParent() call, composition is scheduled in
|
|
|
|
// CompositorWidgetParent::UpdateCompositorWnd().
|
|
|
|
if (!mSetParentCompleted) {
|
|
|
|
// ::SetParent() is not completed yet.
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
MOZ_ASSERT(mWnd == ::GetParent(mCompositorWnds.mCompositorWnd));
|
|
|
|
|
2018-03-29 05:21:47 +03:00
|
|
|
// Force a resize and redraw (but not a move, activate, etc.).
|
2019-11-01 14:01:34 +03:00
|
|
|
if (!::SetWindowPos(
|
|
|
|
mCompositorWnds.mCompositorWnd, nullptr, 0, 0, size.width,
|
|
|
|
size.height,
|
|
|
|
SWP_NOACTIVATE | SWP_NOCOPYBITS | SWP_NOOWNERZORDER | SWP_NOZORDER)) {
|
2018-03-29 05:21:47 +03:00
|
|
|
return;
|
|
|
|
}
|
2019-11-01 14:01:34 +03:00
|
|
|
|
2018-03-29 05:21:47 +03:00
|
|
|
mLastCompositorWndSize = size;
|
|
|
|
}
|
|
|
|
|
Bug 1581855:Part 2 - Present VR output to VR Host r=kip,jrmuizel,sotaro,bryce
This change is a continuation of Part 1 (Bug 1570128), where the 2D content rendered by Firefox for Firefox Reality on Desktop is marshalled through VRHost so that it can be presented in a VR environment.
A new class, FxrOutputHandler, is created to manage creating a sharable texture, sharing it through VRShMem, and updating it when content updates. This class updates content with both WebRender and conventional rendering output.
This initial iteration of FxrOutputHandler does not have synchronization between reading and writing this shared texture across processes. A subsequent fix (Bug 1581881) is pending, which will reuse WebVR code to manage writing to and reading from a pool of textures.
This also presents issues with rendering protected media, so an additional class, FxrWindowManager, is created to manage all windows created for Firefox Reality on Desktop so that it can inform whether or not protected media can be presented.
The automated manual tests in vrhosttest.cpp now show the real shared texture handle rather than a fake value, which shows that marshaling succeeded.
Differential Revision: https://phabricator.services.mozilla.com/D46179
--HG--
extra : moz-landing-system : lando
2019-09-26 15:50:44 +03:00
|
|
|
// Creates a new instance of FxROutputHandler so that this compositor widget
|
|
|
|
// can send its output to Firefox Reality for Desktop.
|
2019-09-04 22:58:51 +03:00
|
|
|
void WinCompositorWidget::RequestFxrOutput() {
|
Bug 1581855:Part 2 - Present VR output to VR Host r=kip,jrmuizel,sotaro,bryce
This change is a continuation of Part 1 (Bug 1570128), where the 2D content rendered by Firefox for Firefox Reality on Desktop is marshalled through VRHost so that it can be presented in a VR environment.
A new class, FxrOutputHandler, is created to manage creating a sharable texture, sharing it through VRShMem, and updating it when content updates. This class updates content with both WebRender and conventional rendering output.
This initial iteration of FxrOutputHandler does not have synchronization between reading and writing this shared texture across processes. A subsequent fix (Bug 1581881) is pending, which will reuse WebVR code to manage writing to and reading from a pool of textures.
This also presents issues with rendering protected media, so an additional class, FxrWindowManager, is created to manage all windows created for Firefox Reality on Desktop so that it can inform whether or not protected media can be presented.
The automated manual tests in vrhosttest.cpp now show the real shared texture handle rather than a fake value, which shows that marshaling succeeded.
Differential Revision: https://phabricator.services.mozilla.com/D46179
--HG--
extra : moz-landing-system : lando
2019-09-26 15:50:44 +03:00
|
|
|
MOZ_ASSERT(mFxrHandler == nullptr);
|
2019-09-04 22:58:51 +03:00
|
|
|
|
Bug 1581855:Part 2 - Present VR output to VR Host r=kip,jrmuizel,sotaro,bryce
This change is a continuation of Part 1 (Bug 1570128), where the 2D content rendered by Firefox for Firefox Reality on Desktop is marshalled through VRHost so that it can be presented in a VR environment.
A new class, FxrOutputHandler, is created to manage creating a sharable texture, sharing it through VRShMem, and updating it when content updates. This class updates content with both WebRender and conventional rendering output.
This initial iteration of FxrOutputHandler does not have synchronization between reading and writing this shared texture across processes. A subsequent fix (Bug 1581881) is pending, which will reuse WebVR code to manage writing to and reading from a pool of textures.
This also presents issues with rendering protected media, so an additional class, FxrWindowManager, is created to manage all windows created for Firefox Reality on Desktop so that it can inform whether or not protected media can be presented.
The automated manual tests in vrhosttest.cpp now show the real shared texture handle rather than a fake value, which shows that marshaling succeeded.
Differential Revision: https://phabricator.services.mozilla.com/D46179
--HG--
extra : moz-landing-system : lando
2019-09-26 15:50:44 +03:00
|
|
|
mFxrHandler.reset(new FxROutputHandler());
|
2019-09-04 22:58:51 +03:00
|
|
|
}
|
|
|
|
|
2016-05-05 08:00:13 +03:00
|
|
|
} // namespace widget
|
|
|
|
} // namespace mozilla
|