forked from mirrors/gecko-dev
cfb26bdf6f
If an external image shows up multiple times while using a different image rendering setting on each instance, we can erroneously call handler.lock() for each instance in parallel, thus defaulting to the last image rendering setting supplied for all instances in that batch. To work around this, we get rid of the concept of having RenderTextureHosts maintain and set the image rendering state, which results in a nice simplification. Then, when we go to actually bind an external image inside WebRender, we set the image rendering state at that point, so that regardless of how many instances of an external image are locked simultaneously, we always use the correct image rendering setting for a batch. Differential Revision: https://phabricator.services.mozilla.com/D158920
78 lines
2.5 KiB
C++
78 lines
2.5 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/. */
|
|
|
|
#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), mMap(), 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, &mMap))) {
|
|
return InvalidToWrExternalImage();
|
|
}
|
|
mLocked = true;
|
|
}
|
|
|
|
return RawDataToWrExternalImage(mMap.mData,
|
|
mMap.mStride * mSurface->GetSize().height);
|
|
}
|
|
|
|
void RenderSharedSurfaceTextureHost::Unlock() {
|
|
if (mLocked) {
|
|
mSurface->Unmap();
|
|
mLocked = false;
|
|
}
|
|
}
|
|
|
|
size_t RenderSharedSurfaceTextureHost::Bytes() {
|
|
return mSurface->Stride() * mSurface->GetSize().height;
|
|
}
|
|
|
|
size_t RenderSharedSurfaceTextureHost::GetPlaneCount() const { return 1; }
|
|
|
|
gfx::SurfaceFormat RenderSharedSurfaceTextureHost::GetFormat() const {
|
|
return mSurface->GetFormat();
|
|
}
|
|
|
|
gfx::ColorDepth RenderSharedSurfaceTextureHost::GetColorDepth() const {
|
|
return gfx::ColorDepth::COLOR_8;
|
|
}
|
|
|
|
bool RenderSharedSurfaceTextureHost::MapPlane(RenderCompositor* aCompositor,
|
|
uint8_t aChannelIndex,
|
|
PlaneInfo& aPlaneInfo) {
|
|
if (NS_WARN_IF(
|
|
!mSurface->Map(gfx::DataSourceSurface::MapType::READ, &mMap))) {
|
|
return false;
|
|
}
|
|
aPlaneInfo.mData = mMap.mData;
|
|
aPlaneInfo.mStride = mMap.mStride;
|
|
aPlaneInfo.mSize = mSurface->GetSize();
|
|
return true;
|
|
}
|
|
|
|
void RenderSharedSurfaceTextureHost::UnmapPlanes() { mSurface->Unmap(); }
|
|
|
|
} // namespace wr
|
|
} // namespace mozilla
|