Bug 1331944 - Part 4. Add RenderSharedSurfaceTextureHost wrapper to integrate with external images. r=jrmuizel

This commit is contained in:
Andrew Osmond 2017-10-30 09:10:44 -04:00
Родитель c69759053e
Коммит 957705f10c
3 изменённых файлов: 92 добавлений и 0 удалений

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -10,6 +10,7 @@ with Files('**'):
EXPORTS.mozilla.webrender += [
'RenderBufferTextureHost.h',
'RendererOGL.h',
'RenderSharedSurfaceTextureHost.h',
'RenderTextureHost.h',
'RenderTextureHostOGL.h',
'RenderThread.h',
@ -23,6 +24,7 @@ UNIFIED_SOURCES += [
'Moz2DImageRenderer.cpp',
'RenderBufferTextureHost.cpp',
'RendererOGL.cpp',
'RenderSharedSurfaceTextureHost.cpp',
'RenderTextureHost.cpp',
'RenderTextureHostOGL.cpp',
'RenderThread.cpp',