mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
a057fcd85b
- Bug 1201329 - Use AlignedStorage2 instead of char[] for IPDL union members. r=billm (420db1710) - Bug 1146214 - Remove unused set fence functions. r=nical (148188894) - Bug 1146214 - Combine FenceHandle and FenceHandleFromChild. r=nical (9d33cdedc) - Bug 1147894 - Remove the redundant OpUpdateTexture IPDL message. r=sotaro (c3b037c92) - Bug 1146214 - Implement fence delivery. Combine ipc messages and remove reply fence delivery message. r=nical (cd115f0db) - Bug 1146214 - Remove the unused code after refactoring. r=nical (2582f1dfa) - Bug 1146214 - Rename some functions after refactoring. r=nical (fd7655c71) - Bug 1150381 - [LayerScope]: Don't showing the same texture in the same frame on LayerScope. r=chiajung (7a5310113) - Bug 1162395 - [LayerScope]: No need to read and send the texture when the same texture id contains in a frame. r=cku (2c67a0994) - Bug 1168015 - Dump source image from graphic buffer directly on B2G. r=kamidphish, r=hshih (108f3dd5a) - Bug 1158575: Support using GDI rendering for opaque surfaces when using cross-process layers. r=jrmuizel (8913ea2ff) - Bug 1155498 - Use FdObj to replace FenceHandle's android fence. r=sotaro (ac0f66f02) - Bug 1155498 - Part 2 - Use new FenceHandle to handle the fence in TextureHost. r=sotaro (8c3cd6427) - Bug 1152370 part 1 - Add android aosp VirtualDisplaySurface r=mwu (795674527) - Bug 1152370 part 2 - Add DisplaySurface r=mwu (f4e7cb123) - Bug 1151936 - Update GLContextEGL's EGLSurface override handling r=jgilbert (a1a72947b) - Bug 1154313 - Move sUsingHwc to gfxPrefs r=mwu,nical (d315f572a) - Bug 1152361 - Ensure outbufAcquireFenceFd is initialized during boot animation. r=mwu (c17f9bc1a) - Bug 1152135 - Split EGLSurface buffer swap and HWC buffer swap r=mwu,nical,jgilbert (2ec0aaccc) - Bug 1148149 - Support Android Presentation API. r=snorp, r=jgilbert (60ae01557) - Bug 1150518 - Remove glClear() on blit composition r=Sushil (24b242a14) - Bug 1152370 part 3 - Use DisplaySurface r=mwu (c531c0b44) - Bug 1157661 - Fix a null-check in CompositorOGL::DrawQuad. r=nical (c00d429d3) - Bug 1113425 part 1 - Fix some bad CSS comment syntax in animation tests; r=mattwoodrow (7abbbb3de) - Bug 1113425 part 2 - Apply async properties when querying the animated transform; r=mattwoodrow (52e778eeb) - Bug 1113425 part 4 - Enable test_deferred_start.html on all platforms; r=mattwoodrow (3884a02a3) - Bug 1113425 part 3 - Make test_deferred_start.html wait an extra frame; r=mattwoodrow (0971c8836) - Bug 1148949 - Apply async properties when querying the animated transform for cross-process compositor parents too; r=mattwoodrow (8bdeafc25) - Bug 1157066. When reading back the OMTA transfrom of a layer don't include transforms from async panning or zooming. r=kats,birtles (43c1bab02) - Bug 1129133 - Clean up GeckoTouchDispatcher so that it's a real singleton. r=kats,mwu (ac97ee5f4) - Bug 1140578 - Remove some redundant code and an unused return value. r=mchang (9d02a9794) - Bug 1140578 - Simplify some code. r=mchang (5a2f95805) - Bug 1140578 - Add a explicit flag to track if we have pending touch moves to process. r=mchang (3255a2ac8) - Bug 1140578 - Prevent resampling moves across non-move touch events. r=mchang (5a2622f6c) - Bug 1146987 - Deal with cases where we get a batch of interleaved move and non-move events on the libui thread before anything is processed, with resampling disabled. r=mchang (462ce355c) - Bug 1149412 - Remove bad assertion. r=mchang (d9d2db4ba) - Bug 1137151: Marked destructor of |GeckoTouchDispatcher| as protected, r=mwu (21fae6af2) - Bug 1138502. Reset vsync unobserve count if a force composite occurs. r=mstange (9682c9e62) - Bug 1148583 - Dispatch touch events before composites. r=kats (cfabb0eef) - Bug 1128690 - Ensure Talos Performance Tests still work with silk enabled. r=mstange (089e87b89) - Bug 1138181 - Be more aggressive in updating plugin geometry in the compositor, avoids filtering out important offset updates that don't involve remote layer tree updates. r=roc (e341636de) - comment coming from Bug 1143249 (2f6c7bdc8) - Bug 1154614 - Don't try to pick up the same non-reentrant lock twice. r=dvander a=RyanVM (c69cba3d9) - Bug 1156981 - Split CompositorParent's scheduling of composition to CompositorScheduler r=mchang (bf87b2ba3) - Bug 1139541 - Make HWC skip opacity=0 layers. r=sotaro (cd6d5114c) - Bug 1149646 - Delete non-uniform vsync interval warning. r=kats (5bc0cd3fa) - Bug 1155498 - Part 3 - Use new FenceHandle to handle the fence in Compositor. r=sotaro (f5c685606) - Bug 1155498 - Part 4 - Use new FenceHandle to handle the fence in TextureClient. r=sotaro (0390d19fd) - Bug 1155498 - Part 5 - Use new FenceHandle to handle Decoder fence. r=sotaro (a99b62351) - Bug 1164513 - Add nullptr check r=milan (41053d048) - Bug 1155495 - Part 1: Remove TextureHostOGL and integrate the platform specific API into TextureHost. r=nical, r=sotaro (9c909e5e2) - Bug 1155495 - Part 2: Remove unnecessary class inheritance and casting. r=nical, r=sotaro (4ce5869ff) - Bug 1133007 - Send the content of a texture only if its was altered since previous transmission. r=kamidphish, r=boris (f78a07160) - Bug 1156456 patch 1 - Reftests comparing a 3-D transformed cube generated by main-thread paths and off-main-thread animations paths. r=birtles (f0f5309d9) - Bug 1156456 patch 2 - Transform the z component just like the x and y. r=birtles (cc36b5b91) - Bug 1156456 patch 3 - Send transform origin and perspective origin to layer in device pixels rather than CSS pixels. r=birtles (94ea8a04a) - Bug 1156456 followup - Also annotate as fuzzy on Mulet, on a CLOSED TREE. (712c97eff) - Bug 1156456 followup - Add a simple reftest for off-main-thread animation of opacity. (eac0fe0e4) - Bug 1157455 patch 1 - Add tests for OMTA transforms in degrees in addition to those in radians. r=birtles (83fb5b7af) - Bug 1157455 patch 2 - Send angles (in CSS transform functions) to the compositor thread with their units rather than sending all such angles in radians. r=birtles (a8b47f5b0) - Bug 1157455 patch 3 - When interpolating angles, preserve units when possible in order to avoid floating point error. r=birtles (ace148e00) - Bug 1157455 followup - fix test_transitions_per_property.html to expect different angle interpolation results, on a CLOSED TREE. (270ef56eb) - Bug 1022080 - Don't force intermediate surfaces when dumping textures, unless explicitly specified. r=nical (0a010b6c8) - Bug 1022080 - Make non-HTML dumping of textures work better. r=nical (304939544)
287 lines
8.8 KiB
C++
287 lines
8.8 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/. */
|
|
|
|
#include "mozilla/Preferences.h"
|
|
#include "mozilla/UniquePtr.h"
|
|
|
|
#include "SharedSurfaceGralloc.h"
|
|
|
|
#include "GLContext.h"
|
|
#include "SharedSurface.h"
|
|
#include "GLLibraryEGL.h"
|
|
#include "mozilla/layers/GrallocTextureClient.h"
|
|
#include "mozilla/layers/ShadowLayers.h"
|
|
|
|
#include "ui/GraphicBuffer.h"
|
|
#include "../layers/ipc/ShadowLayers.h"
|
|
#include "ScopedGLHelpers.h"
|
|
|
|
#include "gfxPlatform.h"
|
|
#include "gfx2DGlue.h"
|
|
#include "gfxPrefs.h"
|
|
|
|
#define DEBUG_GRALLOC
|
|
#ifdef DEBUG_GRALLOC
|
|
#define DEBUG_PRINT(...) do { printf_stderr(__VA_ARGS__); } while (0)
|
|
#else
|
|
#define DEBUG_PRINT(...) do { } while (0)
|
|
#endif
|
|
|
|
namespace mozilla {
|
|
namespace gl {
|
|
|
|
using namespace mozilla::layers;
|
|
using namespace android;
|
|
|
|
SurfaceFactory_Gralloc::SurfaceFactory_Gralloc(GLContext* prodGL,
|
|
const SurfaceCaps& caps,
|
|
layers::TextureFlags flags,
|
|
layers::ISurfaceAllocator* allocator)
|
|
: SurfaceFactory(prodGL, SharedSurfaceType::Gralloc, caps)
|
|
, mFlags(flags)
|
|
, mAllocator(allocator)
|
|
{
|
|
MOZ_ASSERT(mAllocator);
|
|
}
|
|
|
|
/*static*/ UniquePtr<SharedSurface_Gralloc>
|
|
SharedSurface_Gralloc::Create(GLContext* prodGL,
|
|
const GLFormats& formats,
|
|
const gfx::IntSize& size,
|
|
bool hasAlpha,
|
|
layers::TextureFlags flags,
|
|
ISurfaceAllocator* allocator)
|
|
{
|
|
GLLibraryEGL* egl = &sEGLLibrary;
|
|
MOZ_ASSERT(egl);
|
|
|
|
UniquePtr<SharedSurface_Gralloc> ret;
|
|
|
|
DEBUG_PRINT("SharedSurface_Gralloc::Create -------\n");
|
|
|
|
if (!HasExtensions(egl, prodGL))
|
|
return Move(ret);
|
|
|
|
gfxContentType type = hasAlpha ? gfxContentType::COLOR_ALPHA
|
|
: gfxContentType::COLOR;
|
|
|
|
auto platform = gfxPlatform::GetPlatform();
|
|
gfxImageFormat format = platform->OptimalFormatForContent(type);
|
|
|
|
typedef GrallocTextureClientOGL ptrT;
|
|
RefPtr<ptrT> grallocTC = new ptrT(allocator,
|
|
gfx::ImageFormatToSurfaceFormat(format),
|
|
gfx::BackendType::NONE, // we don't need to use it with a DrawTarget
|
|
flags);
|
|
|
|
if (!grallocTC->AllocateForGLRendering(size)) {
|
|
return Move(ret);
|
|
}
|
|
|
|
sp<GraphicBuffer> buffer = grallocTC->GetGraphicBuffer();
|
|
|
|
EGLDisplay display = egl->Display();
|
|
EGLClientBuffer clientBuffer = buffer->getNativeBuffer();
|
|
EGLint attrs[] = {
|
|
LOCAL_EGL_NONE, LOCAL_EGL_NONE
|
|
};
|
|
EGLImage image = egl->fCreateImage(display,
|
|
EGL_NO_CONTEXT,
|
|
LOCAL_EGL_NATIVE_BUFFER_ANDROID,
|
|
clientBuffer, attrs);
|
|
if (!image) {
|
|
return Move(ret);
|
|
}
|
|
|
|
prodGL->MakeCurrent();
|
|
GLuint prodTex = 0;
|
|
prodGL->fGenTextures(1, &prodTex);
|
|
ScopedBindTexture autoTex(prodGL, prodTex);
|
|
|
|
prodGL->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_MIN_FILTER, LOCAL_GL_LINEAR);
|
|
prodGL->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_MAG_FILTER, LOCAL_GL_LINEAR);
|
|
prodGL->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_WRAP_S, LOCAL_GL_CLAMP_TO_EDGE);
|
|
prodGL->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_WRAP_T, LOCAL_GL_CLAMP_TO_EDGE);
|
|
|
|
prodGL->fEGLImageTargetTexture2D(LOCAL_GL_TEXTURE_2D, image);
|
|
|
|
egl->fDestroyImage(display, image);
|
|
|
|
ret.reset( new SharedSurface_Gralloc(prodGL, size, hasAlpha, egl,
|
|
allocator, grallocTC,
|
|
prodTex) );
|
|
|
|
DEBUG_PRINT("SharedSurface_Gralloc::Create: success -- surface %p,"
|
|
" GraphicBuffer %p.\n",
|
|
ret.get(), buffer.get());
|
|
|
|
return Move(ret);
|
|
}
|
|
|
|
|
|
SharedSurface_Gralloc::SharedSurface_Gralloc(GLContext* prodGL,
|
|
const gfx::IntSize& size,
|
|
bool hasAlpha,
|
|
GLLibraryEGL* egl,
|
|
layers::ISurfaceAllocator* allocator,
|
|
layers::GrallocTextureClientOGL* textureClient,
|
|
GLuint prodTex)
|
|
: SharedSurface(SharedSurfaceType::Gralloc,
|
|
AttachmentType::GLTexture,
|
|
prodGL,
|
|
size,
|
|
hasAlpha)
|
|
, mEGL(egl)
|
|
, mSync(0)
|
|
, mAllocator(allocator)
|
|
, mTextureClient(textureClient)
|
|
, mProdTex(prodTex)
|
|
{
|
|
}
|
|
|
|
|
|
bool
|
|
SharedSurface_Gralloc::HasExtensions(GLLibraryEGL* egl, GLContext* gl)
|
|
{
|
|
return egl->HasKHRImageBase() &&
|
|
gl->IsExtensionSupported(GLContext::OES_EGL_image);
|
|
}
|
|
|
|
SharedSurface_Gralloc::~SharedSurface_Gralloc()
|
|
{
|
|
|
|
DEBUG_PRINT("[SharedSurface_Gralloc %p] destroyed\n", this);
|
|
|
|
mGL->MakeCurrent();
|
|
mGL->fDeleteTextures(1, &mProdTex);
|
|
|
|
if (mSync) {
|
|
MOZ_ALWAYS_TRUE( mEGL->fDestroySync(mEGL->Display(), mSync) );
|
|
mSync = 0;
|
|
}
|
|
}
|
|
|
|
void
|
|
SharedSurface_Gralloc::Fence()
|
|
{
|
|
if (mSync) {
|
|
MOZ_ALWAYS_TRUE( mEGL->fDestroySync(mEGL->Display(), mSync) );
|
|
mSync = 0;
|
|
}
|
|
|
|
bool disableSyncFence = false;
|
|
// Disable sync fence on AdrenoTM200.
|
|
// AdrenoTM200's sync fence does not work correctly. See Bug 1022205.
|
|
if (mGL->Renderer() == GLRenderer::AdrenoTM200) {
|
|
disableSyncFence = true;
|
|
}
|
|
|
|
// When Android native fences are available, try
|
|
// them first since they're more likely to work.
|
|
// Android native fences are also likely to perform better.
|
|
if (!disableSyncFence &&
|
|
mEGL->IsExtensionSupported(GLLibraryEGL::ANDROID_native_fence_sync))
|
|
{
|
|
mGL->MakeCurrent();
|
|
EGLSync sync = mEGL->fCreateSync(mEGL->Display(),
|
|
LOCAL_EGL_SYNC_NATIVE_FENCE_ANDROID,
|
|
nullptr);
|
|
if (sync) {
|
|
mGL->fFlush();
|
|
#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
|
|
int fenceFd = mEGL->fDupNativeFenceFDANDROID(mEGL->Display(), sync);
|
|
if (fenceFd != -1) {
|
|
mEGL->fDestroySync(mEGL->Display(), sync);
|
|
mTextureClient->SetAcquireFenceHandle(FenceHandle(new FenceHandle::FdObj(fenceFd)));
|
|
} else {
|
|
mSync = sync;
|
|
}
|
|
#else
|
|
mSync = sync;
|
|
#endif
|
|
return;
|
|
}
|
|
}
|
|
|
|
if (!disableSyncFence &&
|
|
mEGL->IsExtensionSupported(GLLibraryEGL::KHR_fence_sync))
|
|
{
|
|
mGL->MakeCurrent();
|
|
mSync = mEGL->fCreateSync(mEGL->Display(),
|
|
LOCAL_EGL_SYNC_FENCE,
|
|
nullptr);
|
|
if (mSync) {
|
|
mGL->fFlush();
|
|
return;
|
|
}
|
|
}
|
|
|
|
// We should be able to rely on genlock write locks/read locks.
|
|
// But they're broken on some configs, and even a glFinish doesn't
|
|
// work. glReadPixels seems to, though.
|
|
if (gfxPrefs::GrallocFenceWithReadPixels()) {
|
|
mGL->MakeCurrent();
|
|
UniquePtr<char[]> buf = MakeUnique<char[]>(4);
|
|
mGL->fReadPixels(0, 0, 1, 1, LOCAL_GL_RGBA, LOCAL_GL_UNSIGNED_BYTE, buf.get());
|
|
}
|
|
}
|
|
|
|
bool
|
|
SharedSurface_Gralloc::WaitSync()
|
|
{
|
|
if (!mSync) {
|
|
// We must not be needed.
|
|
return true;
|
|
}
|
|
MOZ_ASSERT(mEGL->IsExtensionSupported(GLLibraryEGL::KHR_fence_sync));
|
|
|
|
EGLint status = mEGL->fClientWaitSync(mEGL->Display(),
|
|
mSync,
|
|
0,
|
|
LOCAL_EGL_FOREVER);
|
|
|
|
if (status != LOCAL_EGL_CONDITION_SATISFIED) {
|
|
return false;
|
|
}
|
|
|
|
MOZ_ALWAYS_TRUE( mEGL->fDestroySync(mEGL->Display(), mSync) );
|
|
mSync = 0;
|
|
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
SharedSurface_Gralloc::PollSync()
|
|
{
|
|
if (!mSync) {
|
|
// We must not be needed.
|
|
return true;
|
|
}
|
|
MOZ_ASSERT(mEGL->IsExtensionSupported(GLLibraryEGL::KHR_fence_sync));
|
|
|
|
EGLint status = 0;
|
|
MOZ_ALWAYS_TRUE( mEGL->fGetSyncAttrib(mEGL->Display(),
|
|
mSync,
|
|
LOCAL_EGL_SYNC_STATUS_KHR,
|
|
&status) );
|
|
if (status != LOCAL_EGL_SIGNALED_KHR) {
|
|
return false;
|
|
}
|
|
|
|
MOZ_ALWAYS_TRUE( mEGL->fDestroySync(mEGL->Display(), mSync) );
|
|
mSync = 0;
|
|
|
|
return true;
|
|
}
|
|
|
|
void
|
|
SharedSurface_Gralloc::WaitForBufferOwnership()
|
|
{
|
|
mTextureClient->WaitForBufferOwnership();
|
|
}
|
|
|
|
}
|
|
}
|