author | Andrew Osmond <aosmond@mozilla.com> |
Mon, 30 Oct 2017 09:10:44 -0400 | |
changeset 389105 | 5bdfda0b0b3aeba50ed171ef0227ab6cc9fbede7 |
parent 389104 | 40ec5550739449f1cb8ad7d030a40cc10f9653bc |
child 389106 | 56e6ab347bae39b0e68dad0c5968777aa0528598 |
push id | 32778 |
push user | archaeopteryx@coole-files.de |
push date | Mon, 30 Oct 2017 22:52:59 +0000 |
treeherder | mozilla-central@083a9c84fbd0 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jrmuizel |
bugs | 1331944 |
milestone | 58.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
new file mode 100644 --- /dev/null +++ b/gfx/webrender_bindings/RenderSharedSurfaceTextureHost.cpp @@ -0,0 +1,53 @@ +/* -*- Mode: C++; tab-width: 20; 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/. */ + +#include "RenderSharedSurfaceTextureHost.h" + +#include "mozilla/gfx/Logging.h" +#include "mozilla/layers/ImageDataSerializer.h" +#include "mozilla/layers/SourceSurfaceSharedData.h" + +namespace mozilla { +namespace wr { + +RenderSharedSurfaceTextureHost::RenderSharedSurfaceTextureHost(gfx::SourceSurfaceSharedDataWrapper* aSurface) + : mSurface(aSurface) + , mLocked(false) +{ + MOZ_COUNT_CTOR_INHERITED(RenderSharedSurfaceTextureHost, RenderTextureHost); + MOZ_ASSERT(aSurface); +} + +RenderSharedSurfaceTextureHost::~RenderSharedSurfaceTextureHost() +{ + MOZ_COUNT_DTOR_INHERITED(RenderSharedSurfaceTextureHost, RenderTextureHost); +} + +wr::WrExternalImage +RenderSharedSurfaceTextureHost::Lock(uint8_t aChannelIndex, gl::GLContext* aGL) +{ + if (!mLocked) { + if (NS_WARN_IF(!mSurface->Map(gfx::DataSourceSurface::MapType::READ_WRITE, + &mMap))) { + return RawDataToWrExternalImage(nullptr, 0); + } + mLocked = true; + } + + return RawDataToWrExternalImage(mMap.mData, + mMap.mStride * mSurface->GetSize().height); +} + +void +RenderSharedSurfaceTextureHost::Unlock() +{ + if (mLocked) { + mSurface->Unmap(); + mLocked = false; + } +} + +} // namespace wr +} // namespace mozilla
new file mode 100644 --- /dev/null +++ b/gfx/webrender_bindings/RenderSharedSurfaceTextureHost.h @@ -0,0 +1,37 @@ +/* -*- Mode: C++; tab-width: 20; 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/. */ + +#ifndef MOZILLA_GFX_RENDERSHAREDSURFACETEXTUREHOST_H +#define MOZILLA_GFX_RENDERSHAREDSURFACETEXTUREHOST_H + +#include "RenderTextureHost.h" + +namespace mozilla { +namespace gfx { +class SourceSurfaceSharedDataWrapper; +} + +namespace wr { + +class RenderSharedSurfaceTextureHost final : public RenderTextureHost +{ +public: + explicit RenderSharedSurfaceTextureHost(gfx::SourceSurfaceSharedDataWrapper* aSurface); + + wr::WrExternalImage Lock(uint8_t aChannelIndex, gl::GLContext* aGL) override; + void Unlock() override; + +private: + ~RenderSharedSurfaceTextureHost() override; + + RefPtr<gfx::SourceSurfaceSharedDataWrapper> mSurface; + gfx::DataSourceSurface::MappedSurface mMap; + bool mLocked; +}; + +} // namespace wr +} // namespace mozilla + +#endif // MOZILLA_GFX_RENDERSHAREDSURFACETEXTUREHOST_H
--- a/gfx/webrender_bindings/moz.build +++ b/gfx/webrender_bindings/moz.build @@ -5,29 +5,31 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. with Files('**'): BUG_COMPONENT = ('Core', 'Graphics: WebRender') EXPORTS.mozilla.webrender += [ 'RenderBufferTextureHost.h', 'RendererOGL.h', + 'RenderSharedSurfaceTextureHost.h', 'RenderTextureHost.h', 'RenderTextureHostOGL.h', 'RenderThread.h', 'webrender_ffi.h', 'webrender_ffi_generated.h', 'WebRenderAPI.h', 'WebRenderTypes.h', ] UNIFIED_SOURCES += [ 'Moz2DImageRenderer.cpp', 'RenderBufferTextureHost.cpp', 'RendererOGL.cpp', + 'RenderSharedSurfaceTextureHost.cpp', 'RenderTextureHost.cpp', 'RenderTextureHostOGL.cpp', 'RenderThread.cpp', 'WebRenderAPI.cpp', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': EXPORTS.mozilla.webrender += [