Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
/* -*- 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/. */
|
|
|
|
|
2013-08-11 16:17:23 -07:00
|
|
|
#include "ImageClient.h"
|
|
|
|
#include <stdint.h> // for uint32_t
|
|
|
|
#include "ImageContainer.h" // for Image, PlanarYCbCrImage, etc
|
|
|
|
#include "ImageTypes.h" // for ImageFormat::PLANAR_YCBCR, etc
|
|
|
|
#include "SharedTextureImage.h" // for SharedTextureImage::Data, etc
|
|
|
|
#include "gfx2DGlue.h" // for ImageFormatToSurfaceFormat
|
|
|
|
#include "gfxASurface.h" // for gfxASurface, etc
|
|
|
|
#include "gfxPlatform.h" // for gfxPlatform
|
|
|
|
#include "gfxPoint.h" // for gfxIntSize
|
|
|
|
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc
|
|
|
|
#include "mozilla/RefPtr.h" // for RefPtr, TemporaryRef
|
|
|
|
#include "mozilla/gfx/BaseSize.h" // for BaseSize
|
|
|
|
#include "mozilla/gfx/Point.h" // for IntSize
|
|
|
|
#include "mozilla/gfx/Types.h" // for SurfaceFormat, etc
|
|
|
|
#include "mozilla/layers/CompositableClient.h" // for CompositableClient
|
|
|
|
#include "mozilla/layers/CompositableForwarder.h"
|
|
|
|
#include "mozilla/layers/CompositorTypes.h" // for CompositableType, etc
|
|
|
|
#include "mozilla/layers/ISurfaceAllocator.h"
|
|
|
|
#include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor, etc
|
|
|
|
#include "mozilla/layers/ShadowLayers.h" // for ShadowLayerForwarder
|
2013-08-11 19:21:17 -07:00
|
|
|
#include "mozilla/layers/SharedPlanarYCbCrImage.h"
|
2013-08-11 16:17:23 -07:00
|
|
|
#include "mozilla/layers/SharedRGBImage.h"
|
|
|
|
#include "mozilla/layers/TextureClient.h" // for TextureClient, etc
|
2013-08-27 13:16:54 -07:00
|
|
|
#include "mozilla/layers/TextureClientOGL.h" // for SharedTextureClientOGL
|
2013-08-11 16:17:23 -07:00
|
|
|
#include "mozilla/mozalloc.h" // for operator delete, etc
|
|
|
|
#include "nsAutoPtr.h" // for nsRefPtr
|
|
|
|
#include "nsCOMPtr.h" // for already_AddRefed
|
|
|
|
#include "nsDebug.h" // for NS_WARNING, NS_ASSERTION
|
|
|
|
#include "nsISupportsImpl.h" // for Image::Release, etc
|
|
|
|
#include "nsRect.h" // for nsIntRect
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
#ifdef MOZ_WIDGET_GONK
|
|
|
|
#include "GrallocImages.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
namespace mozilla {
|
|
|
|
namespace layers {
|
|
|
|
|
|
|
|
/* static */ TemporaryRef<ImageClient>
|
2013-04-16 14:36:06 -07:00
|
|
|
ImageClient::CreateImageClient(CompositableType aCompositableHostType,
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
CompositableForwarder* aForwarder,
|
|
|
|
TextureFlags aFlags)
|
|
|
|
{
|
|
|
|
RefPtr<ImageClient> result = nullptr;
|
|
|
|
switch (aCompositableHostType) {
|
2013-07-30 02:59:51 -07:00
|
|
|
case COMPOSITABLE_IMAGE:
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
case BUFFER_IMAGE_SINGLE:
|
2013-07-30 02:59:51 -07:00
|
|
|
if (gfxPlatform::GetPlatform()->UseDeprecatedTextures()) {
|
|
|
|
result = new DeprecatedImageClientSingle(aForwarder, aFlags, BUFFER_IMAGE_SINGLE);
|
|
|
|
} else {
|
|
|
|
result = new ImageClientSingle(aForwarder, aFlags, COMPOSITABLE_IMAGE);
|
|
|
|
}
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
break;
|
|
|
|
case BUFFER_IMAGE_BUFFERED:
|
2013-07-30 02:59:51 -07:00
|
|
|
if (gfxPlatform::GetPlatform()->UseDeprecatedTextures()) {
|
|
|
|
result = new DeprecatedImageClientSingle(aForwarder, aFlags, BUFFER_IMAGE_BUFFERED);
|
|
|
|
} else {
|
2013-08-08 05:53:12 -07:00
|
|
|
result = new ImageClientBuffered(aForwarder, aFlags, COMPOSITABLE_IMAGE);
|
2013-07-30 02:59:51 -07:00
|
|
|
}
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
break;
|
|
|
|
case BUFFER_BRIDGE:
|
2013-05-03 10:34:29 -07:00
|
|
|
result = new ImageClientBridge(aForwarder, aFlags);
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
break;
|
|
|
|
case BUFFER_UNKNOWN:
|
|
|
|
result = nullptr;
|
|
|
|
break;
|
|
|
|
default:
|
2013-06-28 18:38:30 -07:00
|
|
|
MOZ_CRASH("unhandled program type");
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
NS_ASSERTION(result, "Failed to create ImageClient");
|
|
|
|
|
|
|
|
return result.forget();
|
|
|
|
}
|
|
|
|
|
2013-07-30 02:59:51 -07:00
|
|
|
ImageClientSingle::ImageClientSingle(CompositableForwarder* aFwd,
|
|
|
|
TextureFlags aFlags,
|
|
|
|
CompositableType aType)
|
|
|
|
: ImageClient(aFwd, aType)
|
|
|
|
, mTextureFlags(aFlags)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
ImageClientBuffered::ImageClientBuffered(CompositableForwarder* aFwd,
|
|
|
|
TextureFlags aFlags,
|
|
|
|
CompositableType aType)
|
|
|
|
: ImageClientSingle(aFwd, aFlags, aType)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
TextureInfo ImageClientSingle::GetTextureInfo() const
|
|
|
|
{
|
|
|
|
return TextureInfo(COMPOSITABLE_IMAGE);
|
|
|
|
}
|
|
|
|
|
2013-09-12 07:50:28 -07:00
|
|
|
void
|
|
|
|
ImageClientSingle::FlushImage()
|
|
|
|
{
|
|
|
|
if (mFrontBuffer) {
|
|
|
|
RemoveTextureClient(mFrontBuffer);
|
|
|
|
mFrontBuffer = nullptr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ImageClientBuffered::FlushImage()
|
|
|
|
{
|
|
|
|
if (mFrontBuffer) {
|
|
|
|
RemoveTextureClient(mFrontBuffer);
|
|
|
|
mFrontBuffer = nullptr;
|
|
|
|
}
|
|
|
|
if (mBackBuffer) {
|
|
|
|
RemoveTextureClient(mBackBuffer);
|
|
|
|
mBackBuffer = nullptr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-07-30 02:59:51 -07:00
|
|
|
bool
|
|
|
|
ImageClientSingle::UpdateImage(ImageContainer* aContainer,
|
|
|
|
uint32_t aContentFlags)
|
|
|
|
{
|
|
|
|
AutoLockImage autoLock(aContainer);
|
|
|
|
|
|
|
|
Image *image = autoLock.GetImage();
|
|
|
|
if (!image) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mLastPaintedImageSerial == image->GetSerial()) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (image->AsSharedImage() && image->AsSharedImage()->GetTextureClient()) {
|
|
|
|
// fast path: no need to allocate and/or copy image data
|
2013-08-08 05:53:12 -07:00
|
|
|
RefPtr<TextureClient> texture = image->AsSharedImage()->GetTextureClient();
|
2013-07-30 02:59:51 -07:00
|
|
|
|
2013-09-06 02:03:12 -07:00
|
|
|
if (texture->IsSharedWithCompositor()) {
|
|
|
|
// XXX - temporary fix for bug 911941
|
|
|
|
// This will be changed with bug 912907
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2013-07-30 02:59:51 -07:00
|
|
|
if (mFrontBuffer) {
|
|
|
|
RemoveTextureClient(mFrontBuffer);
|
|
|
|
}
|
2013-08-08 05:53:12 -07:00
|
|
|
mFrontBuffer = texture;
|
|
|
|
AddTextureClient(texture);
|
|
|
|
GetForwarder()->UpdatedTexture(this, texture, nullptr);
|
|
|
|
GetForwarder()->UseTexture(this, texture);
|
2013-07-30 02:59:51 -07:00
|
|
|
} else if (image->GetFormat() == PLANAR_YCBCR) {
|
|
|
|
PlanarYCbCrImage* ycbcr = static_cast<PlanarYCbCrImage*>(image);
|
|
|
|
const PlanarYCbCrImage::Data* data = ycbcr->GetData();
|
|
|
|
if (!data) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mFrontBuffer && mFrontBuffer->IsImmutable()) {
|
|
|
|
RemoveTextureClient(mFrontBuffer);
|
|
|
|
mFrontBuffer = nullptr;
|
|
|
|
}
|
|
|
|
|
2013-08-19 16:39:55 -07:00
|
|
|
bool bufferCreated = false;
|
2013-07-30 02:59:51 -07:00
|
|
|
if (!mFrontBuffer) {
|
2013-08-27 13:16:03 -07:00
|
|
|
mFrontBuffer = CreateBufferTextureClient(gfx::FORMAT_YUV, TEXTURE_DEALLOCATE_HOST);
|
2013-07-30 02:59:51 -07:00
|
|
|
gfx::IntSize ySize(data->mYSize.width, data->mYSize.height);
|
|
|
|
gfx::IntSize cbCrSize(data->mCbCrSize.width, data->mCbCrSize.height);
|
2013-08-04 00:46:17 -07:00
|
|
|
if (!mFrontBuffer->AsTextureClientYCbCr()->AllocateForYCbCr(ySize, cbCrSize, data->mStereoMode)) {
|
2013-07-30 02:59:51 -07:00
|
|
|
mFrontBuffer = nullptr;
|
|
|
|
return false;
|
|
|
|
}
|
2013-08-19 16:39:55 -07:00
|
|
|
bufferCreated = true;
|
2013-07-30 02:59:51 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!mFrontBuffer->Lock(OPEN_READ_WRITE)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
bool status = mFrontBuffer->AsTextureClientYCbCr()->UpdateYCbCr(*data);
|
|
|
|
mFrontBuffer->Unlock();
|
|
|
|
|
2013-08-19 16:39:55 -07:00
|
|
|
if (bufferCreated) {
|
|
|
|
AddTextureClient(mFrontBuffer);
|
|
|
|
}
|
|
|
|
|
2013-07-30 02:59:51 -07:00
|
|
|
if (status) {
|
|
|
|
GetForwarder()->UpdatedTexture(this, mFrontBuffer, nullptr);
|
|
|
|
GetForwarder()->UseTexture(this, mFrontBuffer);
|
|
|
|
} else {
|
|
|
|
MOZ_ASSERT(false);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2013-08-27 13:16:54 -07:00
|
|
|
} else if (image->GetFormat() == SHARED_TEXTURE) {
|
|
|
|
SharedTextureImage* sharedImage = static_cast<SharedTextureImage*>(image);
|
|
|
|
const SharedTextureImage::Data *data = sharedImage->GetData();
|
|
|
|
gfx::IntSize size = gfx::IntSize(image->GetSize().width, image->GetSize().height);
|
|
|
|
|
|
|
|
if (mFrontBuffer) {
|
|
|
|
RemoveTextureClient(mFrontBuffer);
|
|
|
|
mFrontBuffer = nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
RefPtr<SharedTextureClientOGL> buffer = new SharedTextureClientOGL(mTextureFlags);
|
|
|
|
buffer->InitWith(data->mHandle, size, data->mShareType, data->mInverted);
|
|
|
|
mFrontBuffer = buffer;
|
|
|
|
|
|
|
|
AddTextureClient(mFrontBuffer);
|
|
|
|
GetForwarder()->UseTexture(this, mFrontBuffer);
|
2013-07-30 02:59:51 -07:00
|
|
|
} else {
|
|
|
|
nsRefPtr<gfxASurface> surface = image->GetAsSurface();
|
|
|
|
MOZ_ASSERT(surface);
|
|
|
|
|
2013-08-03 10:29:18 -07:00
|
|
|
gfx::IntSize size = gfx::IntSize(image->GetSize().width, image->GetSize().height);
|
|
|
|
|
|
|
|
if (mFrontBuffer &&
|
|
|
|
(mFrontBuffer->IsImmutable() || mFrontBuffer->GetSize() != size)) {
|
2013-07-30 02:59:51 -07:00
|
|
|
RemoveTextureClient(mFrontBuffer);
|
|
|
|
mFrontBuffer = nullptr;
|
|
|
|
}
|
|
|
|
|
2013-08-19 16:39:55 -07:00
|
|
|
bool bufferCreated = false;
|
2013-07-30 02:59:51 -07:00
|
|
|
if (!mFrontBuffer) {
|
|
|
|
gfxASurface::gfxImageFormat format
|
|
|
|
= gfxPlatform::GetPlatform()->OptimalFormatForContent(surface->GetContentType());
|
2013-08-27 13:16:03 -07:00
|
|
|
mFrontBuffer = CreateBufferTextureClient(gfx::ImageFormatToSurfaceFormat(format),
|
|
|
|
TEXTURE_DEALLOCATE_HOST);
|
2013-07-30 02:59:51 -07:00
|
|
|
MOZ_ASSERT(mFrontBuffer->AsTextureClientSurface());
|
|
|
|
mFrontBuffer->AsTextureClientSurface()->AllocateForSurface(size);
|
|
|
|
|
2013-08-19 16:39:55 -07:00
|
|
|
bufferCreated = true;
|
2013-07-30 02:59:51 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!mFrontBuffer->Lock(OPEN_READ_WRITE)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
bool status = mFrontBuffer->AsTextureClientSurface()->UpdateSurface(surface);
|
|
|
|
mFrontBuffer->Unlock();
|
2013-08-19 16:39:55 -07:00
|
|
|
|
|
|
|
if (bufferCreated) {
|
|
|
|
AddTextureClient(mFrontBuffer);
|
|
|
|
}
|
|
|
|
|
2013-07-30 02:59:51 -07:00
|
|
|
if (status) {
|
|
|
|
GetForwarder()->UpdatedTexture(this, mFrontBuffer, nullptr);
|
|
|
|
GetForwarder()->UseTexture(this, mFrontBuffer);
|
|
|
|
} else {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
UpdatePictureRect(image->GetPictureRect());
|
|
|
|
|
|
|
|
mLastPaintedImageSerial = image->GetSerial();
|
|
|
|
aContainer->NotifyPaintedImage(image);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
ImageClientBuffered::UpdateImage(ImageContainer* aContainer,
|
|
|
|
uint32_t aContentFlags)
|
|
|
|
{
|
|
|
|
RefPtr<TextureClient> temp = mFrontBuffer;
|
|
|
|
mFrontBuffer = mBackBuffer;
|
|
|
|
mBackBuffer = temp;
|
|
|
|
return ImageClientSingle::UpdateImage(aContainer, aContentFlags);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ImageClientSingle::AddTextureClient(TextureClient* aTexture)
|
|
|
|
{
|
2013-08-03 10:30:28 -07:00
|
|
|
MOZ_ASSERT((mTextureFlags & aTexture->GetFlags()) == mTextureFlags);
|
2013-07-30 02:59:51 -07:00
|
|
|
CompositableClient::AddTextureClient(aTexture);
|
|
|
|
}
|
|
|
|
|
2013-08-27 13:16:03 -07:00
|
|
|
TemporaryRef<BufferTextureClient>
|
|
|
|
ImageClientSingle::CreateBufferTextureClient(gfx::SurfaceFormat aFormat, TextureFlags aFlags)
|
|
|
|
{
|
|
|
|
return CompositableClient::CreateBufferTextureClient(aFormat, mTextureFlags | aFlags);
|
|
|
|
}
|
|
|
|
|
2013-08-03 10:30:28 -07:00
|
|
|
TemporaryRef<BufferTextureClient>
|
|
|
|
ImageClientSingle::CreateBufferTextureClient(gfx::SurfaceFormat aFormat)
|
|
|
|
{
|
2013-09-02 04:36:42 -07:00
|
|
|
return CompositableClient::CreateBufferTextureClient(aFormat,
|
|
|
|
mTextureFlags | TEXTURE_FLAGS_DEFAULT);
|
2013-08-03 10:30:28 -07:00
|
|
|
}
|
|
|
|
|
2013-07-30 02:59:51 -07:00
|
|
|
void
|
2013-08-08 05:53:12 -07:00
|
|
|
ImageClientSingle::OnDetach()
|
2013-07-30 02:59:51 -07:00
|
|
|
{
|
|
|
|
mFrontBuffer = nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2013-08-08 05:53:12 -07:00
|
|
|
ImageClientBuffered::OnDetach()
|
2013-07-30 02:59:51 -07:00
|
|
|
{
|
|
|
|
mFrontBuffer = nullptr;
|
|
|
|
mBackBuffer = nullptr;
|
|
|
|
}
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
|
|
|
|
ImageClient::ImageClient(CompositableForwarder* aFwd, CompositableType aType)
|
|
|
|
: CompositableClient(aFwd)
|
|
|
|
, mType(aType)
|
|
|
|
, mLastPaintedImageSerial(0)
|
|
|
|
{}
|
|
|
|
|
|
|
|
void
|
|
|
|
ImageClient::UpdatePictureRect(nsIntRect aRect)
|
|
|
|
{
|
|
|
|
if (mPictureRect == aRect) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
mPictureRect = aRect;
|
|
|
|
MOZ_ASSERT(mForwarder);
|
|
|
|
GetForwarder()->UpdatePictureRect(this, aRect);
|
|
|
|
}
|
|
|
|
|
2013-07-24 09:08:35 -07:00
|
|
|
DeprecatedImageClientSingle::DeprecatedImageClientSingle(CompositableForwarder* aFwd,
|
|
|
|
TextureFlags aFlags,
|
|
|
|
CompositableType aType)
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
: ImageClient(aFwd, aType)
|
2013-04-12 00:28:55 -07:00
|
|
|
, mTextureInfo(aType)
|
|
|
|
{
|
|
|
|
mTextureInfo.mTextureFlags = aFlags;
|
|
|
|
}
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
|
2013-04-30 17:42:05 -07:00
|
|
|
bool
|
2013-07-24 09:08:35 -07:00
|
|
|
DeprecatedImageClientSingle::EnsureDeprecatedTextureClient(DeprecatedTextureClientType aType)
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
{
|
|
|
|
// We should not call this method if using ImageBridge or tiled texture
|
|
|
|
// clients since SupportsType always fails
|
2013-07-08 14:30:44 -07:00
|
|
|
if (mDeprecatedTextureClient && mDeprecatedTextureClient->SupportsType(aType)) {
|
2013-04-30 17:42:05 -07:00
|
|
|
return true;
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
}
|
2013-07-08 14:30:44 -07:00
|
|
|
mDeprecatedTextureClient = CreateDeprecatedTextureClient(aType);
|
|
|
|
return !!mDeprecatedTextureClient;
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
2013-07-24 09:08:35 -07:00
|
|
|
DeprecatedImageClientSingle::UpdateImage(ImageContainer* aContainer,
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
uint32_t aContentFlags)
|
|
|
|
{
|
|
|
|
AutoLockImage autoLock(aContainer);
|
|
|
|
|
|
|
|
Image *image = autoLock.GetImage();
|
|
|
|
if (!image) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mLastPaintedImageSerial == image->GetSerial()) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2013-04-30 17:42:05 -07:00
|
|
|
if (image->GetFormat() == PLANAR_YCBCR &&
|
2013-07-08 14:30:44 -07:00
|
|
|
EnsureDeprecatedTextureClient(TEXTURE_YCBCR)) {
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
PlanarYCbCrImage* ycbcr = static_cast<PlanarYCbCrImage*>(image);
|
|
|
|
|
2013-07-24 09:08:35 -07:00
|
|
|
if (ycbcr->AsDeprecatedSharedPlanarYCbCrImage()) {
|
2013-07-08 14:30:44 -07:00
|
|
|
AutoLockDeprecatedTextureClient lock(mDeprecatedTextureClient);
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
|
|
|
|
SurfaceDescriptor sd;
|
2013-07-24 09:08:35 -07:00
|
|
|
if (!ycbcr->AsDeprecatedSharedPlanarYCbCrImage()->ToSurfaceDescriptor(sd)) {
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (IsSurfaceDescriptorValid(*lock.GetSurfaceDescriptor())) {
|
|
|
|
GetForwarder()->DestroySharedSurface(lock.GetSurfaceDescriptor());
|
|
|
|
}
|
|
|
|
|
|
|
|
*lock.GetSurfaceDescriptor() = sd;
|
|
|
|
} else {
|
2013-07-08 14:30:44 -07:00
|
|
|
AutoLockYCbCrClient clientLock(mDeprecatedTextureClient);
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
|
|
|
|
if (!clientLock.Update(ycbcr)) {
|
2013-07-08 14:30:44 -07:00
|
|
|
NS_WARNING("failed to update DeprecatedTextureClient (YCbCr)");
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
2013-04-30 17:42:05 -07:00
|
|
|
} else if (image->GetFormat() == SHARED_TEXTURE &&
|
2013-07-08 14:30:44 -07:00
|
|
|
EnsureDeprecatedTextureClient(TEXTURE_SHARED_GL_EXTERNAL)) {
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
SharedTextureImage* sharedImage = static_cast<SharedTextureImage*>(image);
|
|
|
|
const SharedTextureImage::Data *data = sharedImage->GetData();
|
|
|
|
|
|
|
|
SharedTextureDescriptor texture(data->mShareType,
|
|
|
|
data->mHandle,
|
|
|
|
data->mSize,
|
|
|
|
data->mInverted);
|
2013-07-08 14:30:44 -07:00
|
|
|
mDeprecatedTextureClient->SetDescriptor(SurfaceDescriptor(texture));
|
2013-04-30 17:42:05 -07:00
|
|
|
} else if (image->GetFormat() == SHARED_RGB &&
|
2013-07-08 14:30:44 -07:00
|
|
|
EnsureDeprecatedTextureClient(TEXTURE_SHMEM)) {
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
nsIntRect rect(0, 0,
|
|
|
|
image->GetSize().width,
|
|
|
|
image->GetSize().height);
|
|
|
|
UpdatePictureRect(rect);
|
|
|
|
|
2013-07-08 14:30:44 -07:00
|
|
|
AutoLockDeprecatedTextureClient lock(mDeprecatedTextureClient);
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
|
|
|
|
SurfaceDescriptor desc;
|
2013-07-24 09:08:35 -07:00
|
|
|
if (!static_cast<DeprecatedSharedRGBImage*>(image)->ToSurfaceDescriptor(desc)) {
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
return false;
|
|
|
|
}
|
2013-07-08 14:30:44 -07:00
|
|
|
mDeprecatedTextureClient->SetDescriptor(desc);
|
2013-04-17 14:18:15 -07:00
|
|
|
#ifdef MOZ_WIDGET_GONK
|
2013-04-30 03:14:20 -07:00
|
|
|
} else if (image->GetFormat() == GRALLOC_PLANAR_YCBCR) {
|
2013-07-08 14:30:44 -07:00
|
|
|
EnsureDeprecatedTextureClient(TEXTURE_SHARED_GL_EXTERNAL);
|
2013-04-30 03:14:20 -07:00
|
|
|
|
|
|
|
nsIntRect rect(0, 0,
|
|
|
|
image->GetSize().width,
|
|
|
|
image->GetSize().height);
|
|
|
|
UpdatePictureRect(rect);
|
|
|
|
|
2013-07-08 14:30:44 -07:00
|
|
|
AutoLockDeprecatedTextureClient lock(mDeprecatedTextureClient);
|
2013-04-30 03:14:20 -07:00
|
|
|
|
2013-07-24 19:13:35 -07:00
|
|
|
SurfaceDescriptor desc = static_cast<GrallocImage*>(image)->GetSurfaceDescriptor();
|
2013-04-30 03:14:20 -07:00
|
|
|
if (!IsSurfaceDescriptorValid(desc)) {
|
|
|
|
return false;
|
|
|
|
}
|
2013-07-08 14:30:44 -07:00
|
|
|
mDeprecatedTextureClient->SetDescriptor(desc);
|
2013-04-17 14:18:15 -07:00
|
|
|
#endif
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
} else {
|
|
|
|
nsRefPtr<gfxASurface> surface = image->GetAsSurface();
|
|
|
|
MOZ_ASSERT(surface);
|
|
|
|
|
2013-07-08 14:30:44 -07:00
|
|
|
EnsureDeprecatedTextureClient(TEXTURE_SHMEM);
|
|
|
|
MOZ_ASSERT(mDeprecatedTextureClient, "Failed to create texture client");
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
|
2013-07-08 14:30:44 -07:00
|
|
|
AutoLockShmemClient clientLock(mDeprecatedTextureClient);
|
2013-07-09 14:52:30 -07:00
|
|
|
if (!clientLock.Update(image, aContentFlags, surface)) {
|
2013-07-08 14:30:44 -07:00
|
|
|
NS_WARNING("failed to update DeprecatedTextureClient");
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Updated();
|
|
|
|
|
|
|
|
if (image->GetFormat() == PLANAR_YCBCR) {
|
|
|
|
PlanarYCbCrImage* ycbcr = static_cast<PlanarYCbCrImage*>(image);
|
|
|
|
UpdatePictureRect(ycbcr->GetData()->GetPictureRect());
|
|
|
|
}
|
|
|
|
|
|
|
|
mLastPaintedImageSerial = image->GetSerial();
|
|
|
|
aContainer->NotifyPaintedImage(image);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2013-07-24 09:08:35 -07:00
|
|
|
DeprecatedImageClientSingle::Updated()
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
{
|
2013-07-08 14:30:44 -07:00
|
|
|
mForwarder->UpdateTexture(this, 1, mDeprecatedTextureClient->GetDescriptor());
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
ImageClientBridge::ImageClientBridge(CompositableForwarder* aFwd,
|
|
|
|
TextureFlags aFlags)
|
|
|
|
: ImageClient(aFwd, BUFFER_BRIDGE)
|
|
|
|
, mAsyncContainerID(0)
|
|
|
|
, mLayer(nullptr)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
ImageClientBridge::UpdateImage(ImageContainer* aContainer, uint32_t aContentFlags)
|
|
|
|
{
|
|
|
|
if (!GetForwarder() || !mLayer) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (mAsyncContainerID == aContainer->GetAsyncContainerID()) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
mAsyncContainerID = aContainer->GetAsyncContainerID();
|
|
|
|
static_cast<ShadowLayerForwarder*>(GetForwarder())->AttachAsyncCompositable(mAsyncContainerID, mLayer);
|
|
|
|
AutoLockImage autoLock(aContainer);
|
|
|
|
aContainer->NotifyPaintedImage(autoLock.GetImage());
|
|
|
|
Updated();
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
already_AddRefed<Image>
|
2013-08-28 06:21:05 -07:00
|
|
|
ImageClientSingle::CreateImage(const uint32_t *aFormats,
|
|
|
|
uint32_t aNumFormats)
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
{
|
|
|
|
nsRefPtr<Image> img;
|
|
|
|
for (uint32_t i = 0; i < aNumFormats; i++) {
|
|
|
|
switch (aFormats[i]) {
|
|
|
|
case PLANAR_YCBCR:
|
2013-08-28 06:21:05 -07:00
|
|
|
img = new SharedPlanarYCbCrImage(this);
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
return img.forget();
|
|
|
|
case SHARED_RGB:
|
2013-08-28 06:21:05 -07:00
|
|
|
img = new SharedRGBImage(this);
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
return img.forget();
|
|
|
|
#ifdef MOZ_WIDGET_GONK
|
|
|
|
case GRALLOC_PLANAR_YCBCR:
|
2013-07-24 19:13:35 -07:00
|
|
|
img = new GrallocImage();
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
return img.forget();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
2013-08-28 06:21:05 -07:00
|
|
|
already_AddRefed<Image>
|
|
|
|
DeprecatedImageClientSingle::CreateImage(const uint32_t *aFormats,
|
|
|
|
uint32_t aNumFormats)
|
|
|
|
{
|
|
|
|
nsRefPtr<Image> img;
|
|
|
|
for (uint32_t i = 0; i < aNumFormats; i++) {
|
|
|
|
switch (aFormats[i]) {
|
|
|
|
case PLANAR_YCBCR:
|
|
|
|
img = new DeprecatedSharedPlanarYCbCrImage(GetForwarder());
|
|
|
|
return img.forget();
|
|
|
|
case SHARED_RGB:
|
|
|
|
img = new DeprecatedSharedRGBImage(GetForwarder());
|
|
|
|
return img.forget();
|
|
|
|
#ifdef MOZ_WIDGET_GONK
|
|
|
|
case GRALLOC_PLANAR_YCBCR:
|
|
|
|
img = new GrallocImage();
|
|
|
|
return img.forget();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 02:20:52 -07:00
|
|
|
}
|
|
|
|
}
|