mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-24 18:55:30 +00:00
e0e54098e9
It looks like a big patch but it's mostly just moved code, with some duplication: - Layer creation and destruction moves to LayerManagerComposite and RendererOGL. - BasicCompositor IOSurface setup code moves to BasicCompositor.cpp. - OpenGL IOSurface setup code moves to CompositorOGL and RenderCompositorOGL. The duplication is a bit unfortunate but the LayerManagerComposite code will diverge from the WebRender code soon. BeginFrame gets a new argument aNativeLayer. This argument will go away again over the course of this patch queue. But for now, BeginFrame is the best place to do the layer setup because it's a very close place to PreRender which is where that code was previously. I wasn't able to think of a nice way to give CompositorOGL and BasicCompositor platform-specific behavior without #ifdefs. So now LayerManagerComposite uses the "cross-platform" NativeLayer interface, but CompositorOGL and BasicCompositor use NativeLayerCA because they actually need the IOSurface, and they do that in #ifdef'd code. Luckily, NativeLayerCA.h can be included in both .cpp files and in .mm files. Differential Revision: https://phabricator.services.mozilla.com/D42402 --HG-- extra : moz-landing-system : lando
56 lines
1.6 KiB
C++
56 lines
1.6 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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/. */
|
|
|
|
#ifndef MOZILLA_GFX_RENDERCOMPOSITOR_OGL_H
|
|
#define MOZILLA_GFX_RENDERCOMPOSITOR_OGL_H
|
|
|
|
#include "mozilla/webrender/RenderCompositor.h"
|
|
|
|
namespace mozilla {
|
|
|
|
namespace wr {
|
|
|
|
class RenderCompositorOGL : public RenderCompositor {
|
|
public:
|
|
static UniquePtr<RenderCompositor> Create(
|
|
RefPtr<widget::CompositorWidget>&& aWidget);
|
|
|
|
RenderCompositorOGL(RefPtr<gl::GLContext>&& aGL,
|
|
RefPtr<widget::CompositorWidget>&& aWidget);
|
|
virtual ~RenderCompositorOGL();
|
|
|
|
bool BeginFrame(layers::NativeLayer* aNativeLayer) override;
|
|
void EndFrame() override;
|
|
bool WaitForGPU() override;
|
|
void Pause() override;
|
|
bool Resume() override;
|
|
|
|
gl::GLContext* gl() const override { return mGL; }
|
|
|
|
bool UseANGLE() const override { return false; }
|
|
|
|
LayoutDeviceIntSize GetBufferSize() override;
|
|
|
|
protected:
|
|
void InsertFrameDoneSync();
|
|
|
|
RefPtr<gl::GLContext> mGL;
|
|
|
|
// The native layer that we're currently rendering to, if any.
|
|
// Non-null only between BeginFrame and EndFrame if BeginFrame has been called
|
|
// with a non-null aNativeLayer.
|
|
RefPtr<layers::NativeLayer> mCurrentNativeLayer;
|
|
|
|
// Used to apply back-pressure in WaitForGPU().
|
|
GLsync mPreviousFrameDoneSync;
|
|
GLsync mThisFrameDoneSync;
|
|
};
|
|
|
|
} // namespace wr
|
|
} // namespace mozilla
|
|
|
|
#endif
|