mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
ca19b65a80
- Bug 1250873 - Rename HasInternalBuffer into HasIntermediateBuffer in layers. r=sotaro (578235105f) - Bug 1256045 - Add a null-check in BufferTextureHost::EnsureWrappingTextureSource. r=jnicol (943c73559d) - Bug 1251726 - Check if Compositor is set r=nical (550d5b0164) - Bug 1251427 - Require a full update when a TextureHost switches from a TextureSource to another. r=sotaro (bc59ac4cd7) - Bug 1256693 - ISurfaceAllocator cleanup. r=sotaro (098e824d4d) - Bug 1257939 - initialize BGRX alpha channel to opaque when clearing and ignore uninitialized alpha in texture clients. r=mchang (73d778496f) - more of reapply Bug 1200595 - Consolidate the TextureClient's destruction logic (74517415ed) - Bug 1256693 - Refer to ClientIPCAllocator instead of ISurfaceAllocator where it makes sense. r=sotaro (e81f2dd923) - Bug 1236112 - Block on d3d9 video frames to complete before returning them from the decoder. r=cpearce (25114bb3c4) - Bug 1196409 - Disable D3D11-DXVA for resolutions not supported in hardware. r=jya (3007b1ebff) - Bug 1196411 - Disable DXVA on 60fps 1080p videos for AMD cards that can't decode quick enough. r=jya (9f8f67e12b) - Bug 1200775 - Check intel specific h264 decoder when checking for DXVA support. r=cpearce (e7bcbb10be) - Bug 1257013 - Part 1: Use readback to synchronize d3d9 video. r=cpearce,Bas (d247a9bed6) - Bug 1257013 - Part 2: Use readback to synchronize d3d11 video. r=cpearce,Bas (43883c1607) - missing bit of Bug 1206568: P2 (58de11b22f) - Bug 1239093 - Add pref to allow overriding of hardcoded DXVA blacklist. r=jrmuizel (dfd5e57c2f) - Bug 1217185: To allow for sandboxing, use null HWNDs when creating the D3D device for video decoding. r=mattwoodrow (0c96e66a47) - Bug 1200775 - Followup to fix typo and indent issues (b1d1c76788) - bits of Bug 1207245 - part 3 (52a1939b74) - Bug 1224199 - Don't make the TextureClient wait for compositor recycle if the GLContext is shutting down - r=nical (9a0081f217) - more of Bug 1200595 (047201fd60) - Bug 1253094, part 2 - Stop using DebugOnly for class/struct members in gfx/. r=Bas (bab6569366)
146 lines
4.0 KiB
C++
146 lines
4.0 KiB
C++
/* -*- 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 "mozilla/layers/TextureClientX11.h"
|
|
#include "mozilla/layers/CompositableClient.h"
|
|
#include "mozilla/layers/CompositableForwarder.h"
|
|
#include "mozilla/layers/ISurfaceAllocator.h"
|
|
#include "mozilla/layers/ShadowLayerUtilsX11.h"
|
|
#include "mozilla/gfx/2D.h"
|
|
#include "mozilla/gfx/Logging.h"
|
|
#include "gfxXlibSurface.h"
|
|
#include "gfx2DGlue.h"
|
|
|
|
#include "mozilla/X11Util.h"
|
|
#include <X11/Xlib.h>
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::gfx;
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
X11TextureData::X11TextureData(gfx::IntSize aSize, gfx::SurfaceFormat aFormat,
|
|
bool aClientDeallocation, bool aIsCrossProcess,
|
|
gfxXlibSurface* aSurface)
|
|
: mSize(aSize)
|
|
, mFormat(aFormat)
|
|
, mSurface(aSurface)
|
|
, mClientDeallocation(aClientDeallocation)
|
|
, mIsCrossProcess(aIsCrossProcess)
|
|
{
|
|
MOZ_ASSERT(mSurface);
|
|
}
|
|
|
|
bool
|
|
X11TextureData::Lock(OpenMode aMode, FenceHandle*)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
void
|
|
X11TextureData::Unlock()
|
|
{
|
|
if (mSurface && mIsCrossProcess) {
|
|
FinishX(DefaultXDisplay());
|
|
}
|
|
}
|
|
|
|
|
|
bool
|
|
X11TextureData::Serialize(SurfaceDescriptor& aOutDescriptor)
|
|
{
|
|
MOZ_ASSERT(mSurface);
|
|
if (!mSurface) {
|
|
return false;
|
|
}
|
|
|
|
if (!mClientDeallocation) {
|
|
// Pass to the host the responsibility of freeing the pixmap. ReleasePixmap means
|
|
// the underlying pixmap will not be deallocated in mSurface's destructor.
|
|
// ToSurfaceDescriptor is at most called once per TextureClient.
|
|
mSurface->ReleasePixmap();
|
|
}
|
|
|
|
aOutDescriptor = SurfaceDescriptorX11(mSurface);
|
|
return true;
|
|
}
|
|
|
|
already_AddRefed<gfx::DrawTarget>
|
|
X11TextureData::BorrowDrawTarget()
|
|
{
|
|
MOZ_ASSERT(mSurface);
|
|
if (!mSurface) {
|
|
return nullptr;
|
|
}
|
|
|
|
IntSize size = mSurface->GetSize();
|
|
RefPtr<gfx::DrawTarget> dt = Factory::CreateDrawTargetForCairoSurface(mSurface->CairoSurface(), size);
|
|
|
|
return dt.forget();
|
|
}
|
|
|
|
bool
|
|
X11TextureData::UpdateFromSurface(gfx::SourceSurface* aSurface)
|
|
{
|
|
RefPtr<DrawTarget> dt = BorrowDrawTarget();
|
|
|
|
if (!dt) {
|
|
return false;
|
|
}
|
|
|
|
dt->CopySurface(aSurface, IntRect(IntPoint(), aSurface->GetSize()), IntPoint());
|
|
|
|
return true;
|
|
}
|
|
|
|
void
|
|
X11TextureData::Deallocate(ClientIPCAllocator*)
|
|
{
|
|
mSurface = nullptr;
|
|
}
|
|
|
|
TextureData*
|
|
X11TextureData::CreateSimilar(ClientIPCAllocator* aAllocator,
|
|
TextureFlags aFlags,
|
|
TextureAllocationFlags aAllocFlags) const
|
|
{
|
|
return X11TextureData::Create(mSize, mFormat, aFlags, aAllocator);
|
|
}
|
|
|
|
X11TextureData*
|
|
X11TextureData::Create(gfx::IntSize aSize, gfx::SurfaceFormat aFormat,
|
|
TextureFlags aFlags, ClientIPCAllocator* aAllocator)
|
|
{
|
|
MOZ_ASSERT(aSize.width >= 0 && aSize.height >= 0);
|
|
if (aSize.width <= 0 || aSize.height <= 0 ||
|
|
aSize.width > XLIB_IMAGE_SIDE_SIZE_LIMIT ||
|
|
aSize.height > XLIB_IMAGE_SIDE_SIZE_LIMIT) {
|
|
gfxDebug() << "Asking for X11 surface of invalid size " << aSize.width << "x" << aSize.height;
|
|
return nullptr;
|
|
}
|
|
gfxImageFormat imageFormat = SurfaceFormatToImageFormat(aFormat);
|
|
RefPtr<gfxASurface> surface = gfxPlatform::GetPlatform()->CreateOffscreenSurface(aSize, imageFormat);
|
|
if (!surface || surface->GetType() != gfxSurfaceType::Xlib) {
|
|
NS_ERROR("creating Xlib surface failed!");
|
|
return nullptr;
|
|
}
|
|
|
|
gfxXlibSurface* xlibSurface = static_cast<gfxXlibSurface*>(surface.get());
|
|
|
|
bool crossProcess = !aAllocator->IsSameProcess();
|
|
X11TextureData* texture = new X11TextureData(aSize, aFormat,
|
|
!!(aFlags & TextureFlags::DEALLOCATE_CLIENT),
|
|
crossProcess,
|
|
xlibSurface);
|
|
if (crossProcess) {
|
|
FinishX(DefaultXDisplay());
|
|
}
|
|
|
|
return texture;
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace
|