fd685b2322
From 4e9f52ab105333e8b1120342e9583b2d833a4465 Mon Sep 17 00:00:00 2001 --- dom/canvas/WebGLContext.cpp | 10 +++++-- gfx/gl/GLContext.cpp | 20 -------------- gfx/gl/GLContext.h | 3 -- gfx/gl/GLReadTexImageHelper.cpp | 5 +++- gfx/gl/GLScreenBuffer.cpp | 13 +++++++-- gfx/gl/GLUploadHelpers.cpp | 27 ++++++++++++++++++ gfx/gl/SharedSurfaceGralloc.cpp | 14 ++++------ gfx/gl/SharedSurfaceGralloc.h | 10 +++++-- gfx/gl/SurfaceTypes.cpp | 2 ++ gfx/gl/SurfaceTypes.h | 1 + gfx/layers/client/CanvasClient.cpp | 44 ++++++++++++++++++------------ gfx/layers/client/CanvasClient.h | 8 +++--- gfx/layers/client/ClientCanvasLayer.cpp | 6 ++++ gfx/layers/client/ClientCanvasLayer.h | 2 +- gfx/layers/client/TextureClient.cpp | 11 ++++---- gfx/layers/client/TextureClient.h | 6 ++-- gfx/layers/composite/TextureHost.cpp | 15 +++++----- gfx/layers/composite/TextureHost.h | 10 +++---- gfx/layers/d3d10/CanvasLayerD3D10.cpp | 9 ++++-- gfx/layers/d3d9/CanvasLayerD3D9.cpp | 8 ++++-- gfx/layers/ipc/LayersSurfaces.ipdlh | 4 +-- gfx/layers/moz.build | 4 ++- gfx/layers/opengl/GrallocTextureClient.cpp | 26 +++++++++++++++++- gfx/layers/opengl/GrallocTextureClient.h | 3 ++ 24 files changed, 171 insertions(+), 90 deletions(-)
157 lines
4.8 KiB
C++
157 lines
4.8 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/. */
|
|
|
|
#ifndef MOZILLA_GFX_GRALLOCTEXTURECLIENT_H
|
|
#define MOZILLA_GFX_GRALLOCTEXTURECLIENT_H
|
|
#ifdef MOZ_WIDGET_GONK
|
|
|
|
#include "mozilla/layers/TextureClient.h"
|
|
#include "mozilla/layers/ISurfaceAllocator.h" // For IsSurfaceDescriptorValid
|
|
#include "mozilla/layers/FenceUtils.h" // for FenceHandle
|
|
#include "mozilla/layers/ShadowLayerUtilsGralloc.h"
|
|
#include <ui/GraphicBuffer.h>
|
|
|
|
|
|
namespace android {
|
|
class MediaBuffer;
|
|
};
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
/**
|
|
* A TextureClient implementation based on android::GraphicBuffer (also referred to
|
|
* as "gralloc").
|
|
*
|
|
* Gralloc lets us map texture data in memory (accessible through pointers)
|
|
* and also use it directly as an OpenGL texture without the cost of texture
|
|
* uploads.
|
|
* Gralloc buffers can also be shared accros processes.
|
|
*
|
|
* More info about Gralloc here: https://wiki.mozilla.org/Platform/GFX/Gralloc
|
|
*
|
|
* This is only used in Firefox OS
|
|
*/
|
|
class GrallocTextureClientOGL : public BufferTextureClient
|
|
{
|
|
public:
|
|
GrallocTextureClientOGL(MaybeMagicGrallocBufferHandle buffer,
|
|
gfx::IntSize aSize,
|
|
gfx::BackendType aMoz2dBackend,
|
|
TextureFlags aFlags = TextureFlags::DEFAULT);
|
|
GrallocTextureClientOGL(ISurfaceAllocator* aAllocator,
|
|
gfx::SurfaceFormat aFormat,
|
|
gfx::BackendType aMoz2dBackend,
|
|
TextureFlags aFlags = TextureFlags::DEFAULT);
|
|
|
|
~GrallocTextureClientOGL();
|
|
|
|
virtual bool Lock(OpenMode aMode) MOZ_OVERRIDE;
|
|
|
|
virtual void Unlock() MOZ_OVERRIDE;
|
|
|
|
virtual bool ImplementsLocking() const MOZ_OVERRIDE { return true; }
|
|
|
|
virtual bool HasInternalBuffer() const MOZ_OVERRIDE { return false; }
|
|
|
|
virtual bool IsAllocated() const MOZ_OVERRIDE;
|
|
|
|
virtual bool ToSurfaceDescriptor(SurfaceDescriptor& aOutDescriptor) MOZ_OVERRIDE;
|
|
|
|
virtual void SetRemoveFromCompositableTracker(AsyncTransactionTracker* aTracker) MOZ_OVERRIDE;
|
|
|
|
virtual void WaitForBufferOwnership() MOZ_OVERRIDE;
|
|
|
|
void InitWith(MaybeMagicGrallocBufferHandle aDesc, gfx::IntSize aSize);
|
|
|
|
void SetTextureFlags(TextureFlags aFlags) { AddFlags(aFlags); }
|
|
|
|
gfx::IntSize GetSize() const MOZ_OVERRIDE { return mSize; }
|
|
|
|
android::sp<android::GraphicBuffer> GetGraphicBuffer()
|
|
{
|
|
return mGraphicBuffer;
|
|
}
|
|
|
|
android::PixelFormat GetPixelFormat()
|
|
{
|
|
return mGraphicBuffer->getPixelFormat();
|
|
}
|
|
|
|
virtual uint8_t* GetBuffer() const MOZ_OVERRIDE;
|
|
|
|
virtual gfx::DrawTarget* BorrowDrawTarget() MOZ_OVERRIDE;
|
|
|
|
virtual bool AllocateForSurface(gfx::IntSize aSize,
|
|
TextureAllocationFlags aFlags = ALLOC_DEFAULT) MOZ_OVERRIDE;
|
|
|
|
virtual bool AllocateForYCbCr(gfx::IntSize aYSize,
|
|
gfx::IntSize aCbCrSize,
|
|
StereoMode aStereoMode) MOZ_OVERRIDE;
|
|
|
|
bool AllocateForGLRendering(gfx::IntSize aSize);
|
|
|
|
bool AllocateGralloc(gfx::IntSize aYSize, uint32_t aAndroidFormat, uint32_t aUsage);
|
|
|
|
virtual bool Allocate(uint32_t aSize) MOZ_OVERRIDE;
|
|
|
|
virtual size_t GetBufferSize() const MOZ_OVERRIDE;
|
|
|
|
/**
|
|
* Hold android::MediaBuffer.
|
|
* MediaBuffer needs to be add refed to keep MediaBuffer alive
|
|
* during TextureClient is in use.
|
|
*/
|
|
void SetMediaBuffer(android::MediaBuffer* aMediaBuffer)
|
|
{
|
|
mMediaBuffer = aMediaBuffer;
|
|
}
|
|
|
|
android::MediaBuffer* GetMediaBuffer()
|
|
{
|
|
return mMediaBuffer;
|
|
}
|
|
|
|
virtual TemporaryRef<TextureClient>
|
|
CreateSimilar(TextureFlags aFlags = TextureFlags::DEFAULT,
|
|
TextureAllocationFlags aAllocFlags = ALLOC_DEFAULT) const MOZ_OVERRIDE;
|
|
|
|
static TemporaryRef<TextureClient> FromShSurf(gl::SharedSurface* surf,
|
|
TextureFlags flags);
|
|
|
|
protected:
|
|
/**
|
|
* Unfortunately, until bug 879681 is fixed we need to use a GrallocBufferActor.
|
|
*/
|
|
MaybeMagicGrallocBufferHandle mGrallocHandle;
|
|
|
|
RefPtr<AsyncTransactionTracker> mRemoveFromCompositableTracker;
|
|
|
|
android::sp<android::GraphicBuffer> mGraphicBuffer;
|
|
|
|
/**
|
|
* Points to a mapped gralloc buffer between calls to lock and unlock.
|
|
* Should be null outside of the lock-unlock pair.
|
|
*/
|
|
uint8_t* mMappedBuffer;
|
|
|
|
RefPtr<gfx::DrawTarget> mDrawTarget;
|
|
|
|
/**
|
|
* android::GraphicBuffer has a size information. But there are cases
|
|
* that GraphicBuffer's size and actual video's size are different.
|
|
* Extra size member is necessary. See Bug 850566.
|
|
*/
|
|
gfx::IntSize mSize;
|
|
|
|
android::MediaBuffer* mMediaBuffer;
|
|
};
|
|
|
|
} // namespace layers
|
|
} // namespace mozilla
|
|
|
|
#endif // MOZ_WIDGET_GONK
|
|
#endif
|