mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
5fb64748e4
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(-)
107 lines
3.2 KiB
C++
107 lines
3.2 KiB
C++
/* -*- Mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40; -*- */
|
|
/* 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 SHARED_SURFACE_GRALLOC_H_
|
|
#define SHARED_SURFACE_GRALLOC_H_
|
|
|
|
#include "mozilla/layers/CompositorTypes.h"
|
|
#include "mozilla/layers/LayersSurfaces.h"
|
|
#include "SharedSurface.h"
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
class ISurfaceAllocator;
|
|
class GrallocTextureClientOGL;
|
|
}
|
|
|
|
namespace gl {
|
|
class GLContext;
|
|
class GLLibraryEGL;
|
|
|
|
class SharedSurface_Gralloc
|
|
: public SharedSurface
|
|
{
|
|
public:
|
|
static UniquePtr<SharedSurface_Gralloc> Create(GLContext* prodGL,
|
|
const GLFormats& formats,
|
|
const gfx::IntSize& size,
|
|
bool hasAlpha,
|
|
layers::TextureFlags flags,
|
|
layers::ISurfaceAllocator* allocator);
|
|
|
|
static SharedSurface_Gralloc* Cast(SharedSurface* surf) {
|
|
MOZ_ASSERT(surf->mType == SharedSurfaceType::Gralloc);
|
|
|
|
return (SharedSurface_Gralloc*)surf;
|
|
}
|
|
|
|
protected:
|
|
GLLibraryEGL* const mEGL;
|
|
EGLSync mSync;
|
|
RefPtr<layers::ISurfaceAllocator> mAllocator;
|
|
RefPtr<layers::GrallocTextureClientOGL> mTextureClient;
|
|
const GLuint mProdTex;
|
|
|
|
SharedSurface_Gralloc(GLContext* prodGL,
|
|
const gfx::IntSize& size,
|
|
bool hasAlpha,
|
|
GLLibraryEGL* egl,
|
|
layers::ISurfaceAllocator* allocator,
|
|
layers::GrallocTextureClientOGL* textureClient,
|
|
GLuint prodTex);
|
|
|
|
static bool HasExtensions(GLLibraryEGL* egl, GLContext* gl);
|
|
|
|
public:
|
|
virtual ~SharedSurface_Gralloc();
|
|
|
|
virtual void Fence() MOZ_OVERRIDE;
|
|
virtual bool WaitSync() MOZ_OVERRIDE;
|
|
virtual bool PollSync() MOZ_OVERRIDE;
|
|
|
|
virtual void WaitForBufferOwnership() MOZ_OVERRIDE;
|
|
|
|
virtual void LockProdImpl() MOZ_OVERRIDE {}
|
|
virtual void UnlockProdImpl() MOZ_OVERRIDE {}
|
|
|
|
virtual GLuint ProdTexture() MOZ_OVERRIDE {
|
|
return mProdTex;
|
|
}
|
|
|
|
layers::GrallocTextureClientOGL* GetTextureClient() {
|
|
return mTextureClient;
|
|
}
|
|
};
|
|
|
|
class SurfaceFactory_Gralloc
|
|
: public SurfaceFactory
|
|
{
|
|
protected:
|
|
const layers::TextureFlags mFlags;
|
|
RefPtr<layers::ISurfaceAllocator> mAllocator;
|
|
|
|
public:
|
|
SurfaceFactory_Gralloc(GLContext* prodGL,
|
|
const SurfaceCaps& caps,
|
|
layers::TextureFlags flags,
|
|
layers::ISurfaceAllocator* allocator);
|
|
|
|
virtual UniquePtr<SharedSurface> CreateShared(const gfx::IntSize& size) MOZ_OVERRIDE {
|
|
bool hasAlpha = mReadCaps.alpha;
|
|
|
|
UniquePtr<SharedSurface> ret;
|
|
if (mAllocator) {
|
|
ret = SharedSurface_Gralloc::Create(mGL, mFormats, size, hasAlpha,
|
|
mFlags, mAllocator);
|
|
}
|
|
return Move(ret);
|
|
}
|
|
};
|
|
|
|
} /* namespace gl */
|
|
} /* namespace mozilla */
|
|
|
|
#endif /* SHARED_SURFACE_GRALLOC_H_ */
|