mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
f5a7b27f3d
- Bug 1211204 - Remove possible false-negative with D3D9 texture memory reporting. r=mattwoodrow (74adbcad19)
- Bug 1200595 - D3D9 TextureData implementation. r=Bas (2624bd59a3)
- Bug 1200595 - MacIOSurface TextureData implementation. r=mattwoodrow (98130b5d6b)
- Bug 1200595 - EGLImage TextureData implementation. r=mattwoodrow (8b732af2da)
- Bug 1200595 - AndroidSurface TextureData implementation. r=mattwoodrow (79443ff5d7)
- Bug 1200595 - SharedSurface TextureData implementation. r=jgilbert (aadc8c5601)
- Bug 1200595 - DIB TextureData implementation. r=Bas (d7bae178ad)
- Bug 1200595 - Merge TextureClient and ClientTexture back into TextureClient. r=mattwoodrow (890d76ff9b)
- Bug 1200595 - Consolidate the TextureClient's destruction logic. r=mattwoodrow (fa9ac2e414)
- Allow asynchronous D3D11 TextureClients on the main thread. (bug 1217665 part 5, r=nical) (cb77fa88cc)
- Implement the direct bitmap drawing model for plugins. (bug 1217665 part 6, r=mattwoodrow) (82f9015e5a)
- Implement the direct DXGI drawing model for plugins. (bug 1217665 part 7, r=mattwoodrow) (cdeeb52a91)
- Implement the DidComposite NPAPI callback. (bug 1217665 part 8, r=mattwoodrow) (4eb2a790ae)
- Add an NPN_GetValue query to find the browser's DXGI adapter. (bug 1217665 part 10, r=aklotz,mattwoodrow) (84af4e525a)
- Create a D3D11 content device even if D2D is blocked. (bug 1217665 part 11, r=jrmuizel) (142441808e)
- Bug 1229665 - Convert widget clip regions to LayoutDevicePixels. r=botond. (edf746b278)
- Bug 1204715 - Move browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} to moz.build. r=mshal (8c6b4709bc)
- Bug 1212773 - Pass a base directory to jar maker, instead of a chrome directory. r=gps (1f644706c6)
- Bustage fix for bug 1210687 on a CLOSED TREE. r=me (4cd7000101)
- Bug 1212773 - Extend jar maker syntax for jar file location. r=gps (8119aa2b98)
- Bug 1164039 - moved TelemetryTimestamps.jsm and tests to toolkit/componets/telemetry/. r=dexter (942145656e)
- Bug 1184705 - Search A/B testing cohort identifier should be recorded in FHR, r=rnewman. (b5cf397cf0)
- Bug 1230047 (part 2) - Make several PaintWindow() functions use LayoutDevice coordinates. r=kats. (246e1321ca)
- Bug 1218454 - part 1 - move DialogValueHolder::Get out-of-line; r=bz (2d65438b37)
- Bug 1218454 - part 2 - don't #include nsContentUtils.h from CallbackObject.h; r=bz (59e3b60749)
- Bug 1205945 part.1 Remove unnecessary member of IMEInputHandler, mLastDispatchedCompositionString r=smichaud (2223df8aec)
- Bug 1205945 part.2 Add DispatchCompositionStartEvent() and move the code of OnStartIMEComposition() into it r=smichaud (25449c2bca)
- Bug 1205945 part.3 Move the code of OnUpdateIMEComposition() into DispatchCompositionChangeEvent() r=smichaud (e85a65f2f7)
- Bug 1205945 part.4 Move the code of OnEndIMEComposition() into DispatchCompositionCommitEvent() r=smichaud (21e6218c06)
- Bug 1205945 part.5 Emulate mSelectedRange at dispatching compositionchange or compositioncommit event until OnSelectionChange() is called r=smichaud (f82baaea8e)
- Bug 1205945 part.6 IMEInputHandler::GetAttributedSubstringFromRange() should return stored composition string if the range is in the composition string r=smichaud (53eabe028b)
- Bug 1205399 - Follow-up to fix build bustage for platforms without OS X 10.10 and -Wswitch enabled. r=mstange (c2e8eda9b5)
- Bug 1220337 - Don't show alternate notification actions on OS X 10.8. r=MattN (5ef8449dcc)
- Bug 1224738 - Fix alternate action index getter name on OS X. r=MattN (a6f83ce706)
- Bug 1225908 - AsmSimdTypeToLaneType. r=bbouvier (f850c10bff)
- Bug 1224389 - Odin: refactor types/signatures/values (r=bbouvier) (31bc615781)
- Bug 1224389 - Odin: simplify AsmJSModule global data allocation (r=bbouvier) (3ba518183a)
- Bug 1222684 - IonMonkey: MIPS: Implement callWithPatch and patchCall. r=luke (0ede7a61c3)
- Bug 1224814 - "TraceLogger: Remove redundant checks in BaselineJIT". r=hv1989 (b3865fbdf0)
- Bug 1228369: Rename CodeOffsetLabel into CodeOffset; r=luke (1d0aba3710)
- Bug 1224389 - Odin: refactor stubs, func-ptrs, and masm use (r=bbouvier) (2834725644)
- Bug 1228340: Get rid of the js_ prefix for CodeSpec, CodeName, NumCodeSpecs; r=jorendorff (8ff2b3bcd5)
- Bug 1176214 - Part 2: Preliminary adjustments. r=waldo (f9e2adca8a)
- Bug 1176214 - Part 3: VM core changes. r=waldo (cf5b24fe18)
- Bug 1176214 - Part 4: VM built-in lib changes. r=waldo (603335d2aa)
- Bug 1176214 - Part 5: Ion changes. r=h4writer (b589713e1c)
- Bug 1176214 - Part 6: Odin changes. r=luke (f1dcb025d2)
- Bug 1176214 - Part 7: Ctypes, shell, xpconnect, etc. r=waldo (bdc78e0558)
- Bug 1199578 - test case. r=waldo (6a94fd455a)
- Bug 1211409 - load/store exclusive for ARM-32. r=jolesen (38efc4882e)
- Bug 1205390 - guard against asm.js compilation not being available. r=me (aeefe98cfd)
- Make test runnable on non-Nightly (no bug) r=me (27930210ed)
- Bug 1176214 - Part 8: jit-test changes. r=bbouvier (31c4f42eea)
- Bug 1176214 - Part 9: tests changes. r=bbouvier (a245687f43)
- Bug 1176214 - Part 10: jsapi-tests changes. r=bbouvier (610e0002a2)
- bug 1198656 remove unnecessary reinterpret_casts r=padenot (bc5a67d521)
- bug 1198656 refactor acquiring the content into an object method r=padenot (b7b062fbf1)
- bug 1198656 clear references in mJSChannels on successful content acquire r=padenot (65e5ee1856)
- bug 1198656 delay AudioBuffer allocation until required r=padenot (57d0fd0d01)
- bug 1199559 remove now unused SetRawChannelContents r=padenot (40685ef783)
- Bug 1203616 - Properly scale the input buffer of a WaveShaperNode before processing it with the curve. r=karlt (12e9592a9e)
- Bug 1186343: Throw an InvalidStateError when we set the curve attribute of a WaveShaperNode with a Float32Array of length less than 2; r=padenot,smaug (df83b21fd0)
- bug 1188244 throw in SetCurve() on OOM r=padenot (17967b7b58)
- Bug 1176214 - Part 11: Changes to DOM, except for WebGL. r=bz, r=clb (c40e5c2a68)
- Bug 1176214 - Part 12: Changes to WebGL. r=bz, r=clb (228c90da3c)
- Bug 1176214 - Part 13: Changes to ipc. r=mrbkap (4b11d4e509)
- Bug 1176214 - Part 14: Changes to netwerk. r=jduell (91568c8444)
- Bug 1176214 - Part 15: Changes to xpcom. r=nfroyd (df8d080070)
- Revert "Bug 1176214 - Part 14: Changes to netwerk. r=jduell" (d0aedbac94)
- improved backport of PM because of newer JS_GetArrayBufferData (9d8188ff5e)
- bug 1199559 write decodeAudioData buffer in a format suitable for direct use by AudioBuffer r=padenot (da00bab1a1)
- bug 1225003 null-check mBuffer in SizeOfExcludingThis() r=padenot (c01d389f10)
- Bug 1225365 - Fix assertion in the nsScriptNameSpaceManager memory reporter. r=bz. (a5605a8923)
- Bug 1229458 - Remove SizeOfIncludingThisMustBeUnshared() from string classes. r=mccr8. (26abcea276)
- Bug 1214506. Ensure OggReader sets proper IDs for its tracks. r=jya (a270b02301)
- bits of Bug 1188812 - Obtain CDM can render capability and store into MediaInfo (321388180e)
- Bug 1226450 - Report audio/video codecs used in HTMLMediaElement and WebAudio via telemetry. r=jya (e722b409b7)
342 lines
11 KiB
C++
342 lines
11 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 "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,
|
|
const RefPtr<layers::ISurfaceAllocator>& allocator,
|
|
const layers::TextureFlags& flags)
|
|
: SurfaceFactory(SharedSurfaceType::Gralloc, prodGL, caps, allocator, flags)
|
|
{
|
|
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;
|
|
|
|
GrallocTextureData* texData = GrallocTextureData::CreateForGLRendering(
|
|
size, gfxPlatform::GetPlatform()->Optimal2DFormatForContent(type), allocator
|
|
);
|
|
|
|
if (!texData) {
|
|
return Move(ret);
|
|
}
|
|
|
|
RefPtr<TextureClient> grallocTC = new TextureClient(texData, flags, allocator);
|
|
|
|
sp<GraphicBuffer> buffer = texData->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::TextureClient* textureClient,
|
|
GLuint prodTex)
|
|
: SharedSurface(SharedSurfaceType::Gralloc,
|
|
AttachmentType::GLTexture,
|
|
prodGL,
|
|
size,
|
|
hasAlpha,
|
|
true)
|
|
, 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();
|
|
}
|
|
|
|
bool
|
|
SharedSurface_Gralloc::ToSurfaceDescriptor(layers::SurfaceDescriptor* const out_descriptor)
|
|
{
|
|
return mTextureClient->ToSurfaceDescriptor(*out_descriptor);
|
|
}
|
|
|
|
bool
|
|
SharedSurface_Gralloc::ReadbackBySharedHandle(gfx::DataSourceSurface* out_surface)
|
|
{
|
|
MOZ_ASSERT(out_surface);
|
|
sp<GraphicBuffer> buffer = static_cast<GrallocTextureData*>(
|
|
mTextureClient->GetInternalData()
|
|
)->GetGraphicBuffer();
|
|
|
|
const uint8_t* grallocData = nullptr;
|
|
auto result = buffer->lock(
|
|
GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_NEVER,
|
|
const_cast<void**>(reinterpret_cast<const void**>(&grallocData))
|
|
);
|
|
|
|
if (result == BAD_VALUE) {
|
|
return false;
|
|
}
|
|
|
|
gfx::DataSourceSurface::ScopedMap map(out_surface, gfx::DataSourceSurface::WRITE);
|
|
if (!map.IsMapped()) {
|
|
buffer->unlock();
|
|
return false;
|
|
}
|
|
|
|
uint32_t stride = buffer->getStride() * android::bytesPerPixel(buffer->getPixelFormat());
|
|
uint32_t height = buffer->getHeight();
|
|
uint32_t width = buffer->getWidth();
|
|
for (uint32_t i = 0; i < height; i++) {
|
|
memcpy(map.GetData() + i * map.GetStride(),
|
|
grallocData + i * stride, width * 4);
|
|
}
|
|
|
|
buffer->unlock();
|
|
|
|
android::PixelFormat srcFormat = buffer->getPixelFormat();
|
|
MOZ_ASSERT(srcFormat == PIXEL_FORMAT_RGBA_8888 ||
|
|
srcFormat == PIXEL_FORMAT_BGRA_8888 ||
|
|
srcFormat == PIXEL_FORMAT_RGBX_8888);
|
|
bool isSrcRGB = srcFormat == PIXEL_FORMAT_RGBA_8888 ||
|
|
srcFormat == PIXEL_FORMAT_RGBX_8888;
|
|
|
|
gfx::SurfaceFormat destFormat = out_surface->GetFormat();
|
|
MOZ_ASSERT(destFormat == gfx::SurfaceFormat::R8G8B8X8 ||
|
|
destFormat == gfx::SurfaceFormat::R8G8B8A8 ||
|
|
destFormat == gfx::SurfaceFormat::B8G8R8X8 ||
|
|
destFormat == gfx::SurfaceFormat::B8G8R8A8);
|
|
bool isDestRGB = destFormat == gfx::SurfaceFormat::R8G8B8X8 ||
|
|
destFormat == gfx::SurfaceFormat::R8G8B8A8;
|
|
|
|
if (isSrcRGB != isDestRGB) {
|
|
SwapRAndBComponents(out_surface);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
} // namespace gl
|
|
} // namespace mozilla
|