mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
ee05861206
- Bug 1187056 - Dispatch the meta tag mutation events sooner so that any meta-viewport changes can be processed before scripts continue running. r=smaug (2e6f76079f)
- Bug 1238804. Make <base> actually work in a srcdoc document. r=smaug (a421e7c598)
- Bug 1239585 - Remove eSupportSVG from nsObjectLoadingContent capabilities; r=bz (68a79ef21b)
- Bug 1170572 - MQ CSS change not observed by picture source elements r=jdm (efc0be616e)
- Bug 1206720 - Remove invalid assertions during response image loading. r=jdm (0b6485de95)
- Bug 1229032 - don't copy arrays in PerformanceObserver::Observe; r=baku (f1b70e0bd2)
- Bug 1241840 - Set table cell colspan=0 to 1 instead per the HTML spec. r=bz (1900962d4c)
- Bug 812899 part 1. Split the "image is overflow" concept in ImageDocument into two separate booleans for vertical and horizontal overflow. r=khuey (8735b610f3)
- Bug 812899 part 2. Change the centering code in nsImageDocument to only try vertically centering via auto margins when we're not overflowing in the vertical direction, because if we _are_ overflowing that should cut off part of the image per spec. r=khuey (c3b84a8048)
- Bug 812899 part 3 - Make vertical 'auto' margins on absolutely positioned elements always center, even when the margins are negative. r=dbaron (e345fb9383)
- Bug 1238427 - Avoid a strong reference from the timeout timer to nsGeolocationRequest. r=jdm (2ad4dd3955)
- Bug 1240906 - Shut down geolocation service at xpcom-shutdown instead of quit-application. r=dougt (1e7fc9e624)
- Bug 1129633 - part1. Use win8 geolocation with a fallback to MLS - r=m_kato (3323b4a120)
- Bug 1145111: ensure the pos. cache isn't reset when nsGeolocationService shuts down provider. r=jdm (e69cab889a)
- Bug 1240664 - Only enable bug 1216148's behavior when there is a wakelock support. r=kanru (543a3a55b4)
- Bug 1240766 - Fix startup crash in Geolocation::Init() when principal URI is null r=jdm (1ece684418)
- Bug 1238873 - Handle the bug that if we take cached data, we might not get any update later. r=kchen. r=jdm. (ca186e89b3)
- Bug 1240666 - Follow-up to bug 1216148. r=kchen. (3f650b5f72)
- Bug 1227119 - Set a default value for variable ret. r=dougt (5b68dd1a22)
- Bug 1027734 - Convert mozPay to WebIDL. r=bzbarsky. (a4fd10d539)
- Bug 1214488 - Allow native callers in GetEntryGlobal. r=me (ca68cc8896)
- Bug 1248719. Fix things so that taking ownership of error reporting on an AutoJSAPI on a worker is OK even if that AutoJSAPI was initialized without an explicit global. r=bholley (b8e59eebc6)
- Bug 1156065 - Send cloneable messages from SiteSpecificUserAgent.js to fix UA overrides r=billm (e5cdbe96f6)
- Bug 1210099 - Fix structured clone of expanded principal (r=bholley) (01a5fd4e47)
- Bug 1230351: Replace ThirdPartyUtil::IsThirdPartyInternal's warning-spammy NS_ENSURE_ARG with an equivalent check that lacks the warning. r=mrbkap (037c39472c)
- Bug 1184293 - Don't call ThirdPartyUtil::GetBaseDomain if aUri is null. r=jduell (4853c0e9e0)
- Bug 862147 - instrument usage of window.sidebar.addSearchEngine, r=froydnj,smaug. (ef52ded1c0)
- Bug 1214764 - Convert NS_ENSURE to a plain return in nsDocument::IsScriptEnabled. r=bholley (0f3b6d63b4)
- Bug 1245950: Privately inherit from legacy interfaces nsIDOMWindow/nsIDOMWindowInternal. r=smaug (ff1d431d0d)
- Bug 1245950: Followup to null check before asserting. r=me CLOSED TREE (6e93af4a4a)
- Bug 1236607, pointerlock code should null check inner window before using it, r=xidorn (896d9723d5)
- Bug 1245245 - Fix typo in error string URL. r=botond (58c9548f15)
- Bug 1220604 - Remove dead code from nsGlobalWindow::SetNewDocument. r=baku (fc875db5e4)
- Bug 1247049 - Optimize GetScreenXY by using the new nsDeviceContext method to get desktop scale factor. r=emk (de66d59631)
- missing bit of Bug 962249 part 3 (0b15f8b670)
- Bug 1240978 - Shorten timeout for black screen in fullscreen transition. r=smaug (2554a8e5a7)
- Bug 1246346 - patch 1 - Expose a DesktopToDevice scale factor on nsDeviceContext. r=emk (03856ec7b4)
- Bug 1246346 - patch 2 - Correct the origin of the DOM screen coordinates (screen.left, screen.top) for secondary display on a mixed-DPI configuration. r=emk (15ac2d3be6)
- Bug 1196159 - Set nsGlobalWindow::mIsClosed properly after window.close(). r=billm (27334e4b61)
- Bug 1240241 - Don't recurse infinitely in FilterCachedColorModels::ForColorModel if the original filter node was null. r=roc (1730db5ca7)
- Bug 1247706 - "Please don't disable WebGL if crashed on WebGL context". r=dvander (e25621753e)
- Bug 1244742. Use the default copy constructor and assignment operators. (0dac3bcbfb)
- Bug 1230929 - modified the logic in order to prvent null pointer dereference. r=jmuizelaar (1d5761abc9)
- Bug 1247979. Optimize ScaleToOutsidePixels. r=kats (2b9ef41111)
- Bug 1249368 - use UniquePtr instead of nsAutoArrayPtr in gfxAlphaBoxBlur; r=jrmuizel (e60419d49d)
- Bug 1082598 - Part 4: Workaround for naming conflict in unified sources for Skia and thebes DWrite fonts. r=jrmuizel (84a9e11ded)
- Bug 1172817 - Remove PL_DHashTableEnumerate() use from FontNameCache. r=jtd. (b0632cd825)
- Bug 1197717 - Load fonts from profile-agnostic writable location. r=jfkthame (c9227268ff)
- Bug 1246889 - Correctly check whether hb_blob_create failed in ShareTableAndGetBlob. r=jfkthame (f8c62776be)
- Bug 1246834 - Fix memory reporting of nsFontFamily{List,Name}. r=jfkthame. (0535b8c110)
- Bug 1238134 P1 Provide a Response.cloneUnfiltered() method for chrome code to access internal Response state. r=ehsan (3dc25b1501)
- Bug 1238134 P2 Test chrome-only Response.cloneUnfiltered(). r=ehsan (3c307c4ec0)
- Bug 1100949 - wrap font info reads with structured exception handler. r=bas (2c2cacb05e)
- Bug 1241931 - On shutdown stop any ongoing loading of fonts; GDI in particular. r=jdaggett (057aae8cab)
- Bug 1154182 - enable native keybindings for graphene. r=billm (33e706a020)
- Bug 1167081 - Call PuppetWidget::Destroy() in its destructor. r=roc (58115c3029)
- Bug 1222662 - Disable cursor caching in the content process on Windows. r=aklotz (e760794ee2)
- Bug 1240891 - Silence warning from calling GetNativeData(NS_NATIVE_WINDOW). r=roc (d766a47f66)
- Bug 1248981 - Fix spelling error in nsMenuUtilsX.mm, a=tomcat (b93c16b961)
- Bug 1197925 - Use channel->Open2() in intl/hyphenation/hnjstdio.cpp (r=sicking) (2bf5dd3cd3)
- Bug 1248339 - fix header sort order of hal. r=gsvelto (01b61a2f5d)
- Bug 1232687: Add system-service interface to HAL, r=gsvelto (ab692e1508)
- Bug 1236762 - Simplify locking APIs for SharedSurface. - r=jrmuizel (901ae94a85)
356 lines
11 KiB
C++
356 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 "SharedSurfaceANGLE.h"
|
|
|
|
#include <d3d11.h>
|
|
#include "gfxWindowsPlatform.h"
|
|
#include "GLContextEGL.h"
|
|
#include "GLLibraryEGL.h"
|
|
#include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor, etc
|
|
|
|
namespace mozilla {
|
|
namespace gl {
|
|
|
|
// Returns `EGL_NO_SURFACE` (`0`) on error.
|
|
static EGLSurface
|
|
CreatePBufferSurface(GLLibraryEGL* egl,
|
|
EGLDisplay display,
|
|
EGLConfig config,
|
|
const gfx::IntSize& size)
|
|
{
|
|
auto width = size.width;
|
|
auto height = size.height;
|
|
|
|
EGLint attribs[] = {
|
|
LOCAL_EGL_WIDTH, width,
|
|
LOCAL_EGL_HEIGHT, height,
|
|
LOCAL_EGL_NONE
|
|
};
|
|
|
|
DebugOnly<EGLint> preCallErr = egl->fGetError();
|
|
MOZ_ASSERT(preCallErr == LOCAL_EGL_SUCCESS);
|
|
EGLSurface surface = egl->fCreatePbufferSurface(display, config, attribs);
|
|
EGLint err = egl->fGetError();
|
|
if (err != LOCAL_EGL_SUCCESS)
|
|
return 0;
|
|
|
|
return surface;
|
|
}
|
|
|
|
/*static*/ UniquePtr<SharedSurface_ANGLEShareHandle>
|
|
SharedSurface_ANGLEShareHandle::Create(GLContext* gl, EGLConfig config,
|
|
const gfx::IntSize& size, bool hasAlpha)
|
|
{
|
|
GLLibraryEGL* egl = &sEGLLibrary;
|
|
MOZ_ASSERT(egl);
|
|
MOZ_ASSERT(egl->IsExtensionSupported(
|
|
GLLibraryEGL::ANGLE_surface_d3d_texture_2d_share_handle));
|
|
MOZ_ASSERT(config);
|
|
|
|
EGLDisplay display = egl->Display();
|
|
EGLSurface pbuffer = CreatePBufferSurface(egl, display, config, size);
|
|
if (!pbuffer)
|
|
return nullptr;
|
|
|
|
// Declare everything before 'goto's.
|
|
HANDLE shareHandle = nullptr;
|
|
bool ok = egl->fQuerySurfacePointerANGLE(display,
|
|
pbuffer,
|
|
LOCAL_EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE,
|
|
&shareHandle);
|
|
if (!ok) {
|
|
egl->fDestroySurface(egl->Display(), pbuffer);
|
|
return nullptr;
|
|
}
|
|
void* opaqueKeyedMutex = nullptr;
|
|
egl->fQuerySurfacePointerANGLE(display,
|
|
pbuffer,
|
|
LOCAL_EGL_DXGI_KEYED_MUTEX_ANGLE,
|
|
&opaqueKeyedMutex);
|
|
RefPtr<IDXGIKeyedMutex> keyedMutex = static_cast<IDXGIKeyedMutex*>(opaqueKeyedMutex);
|
|
|
|
GLuint fence = 0;
|
|
if (gl->IsExtensionSupported(GLContext::NV_fence)) {
|
|
gl->MakeCurrent();
|
|
gl->fGenFences(1, &fence);
|
|
}
|
|
|
|
typedef SharedSurface_ANGLEShareHandle ptrT;
|
|
UniquePtr<ptrT> ret( new ptrT(gl, egl, size, hasAlpha, pbuffer, shareHandle,
|
|
keyedMutex, fence) );
|
|
return Move(ret);
|
|
}
|
|
|
|
EGLDisplay
|
|
SharedSurface_ANGLEShareHandle::Display()
|
|
{
|
|
return mEGL->Display();
|
|
}
|
|
|
|
SharedSurface_ANGLEShareHandle::SharedSurface_ANGLEShareHandle(GLContext* gl,
|
|
GLLibraryEGL* egl,
|
|
const gfx::IntSize& size,
|
|
bool hasAlpha,
|
|
EGLSurface pbuffer,
|
|
HANDLE shareHandle,
|
|
const RefPtr<IDXGIKeyedMutex>& keyedMutex,
|
|
GLuint fence)
|
|
: SharedSurface(SharedSurfaceType::EGLSurfaceANGLE,
|
|
AttachmentType::Screen,
|
|
gl,
|
|
size,
|
|
hasAlpha,
|
|
true)
|
|
, mEGL(egl)
|
|
, mPBuffer(pbuffer)
|
|
, mShareHandle(shareHandle)
|
|
, mKeyedMutex(keyedMutex)
|
|
, mFence(fence)
|
|
{
|
|
}
|
|
|
|
|
|
SharedSurface_ANGLEShareHandle::~SharedSurface_ANGLEShareHandle()
|
|
{
|
|
mEGL->fDestroySurface(Display(), mPBuffer);
|
|
|
|
if (mFence) {
|
|
mGL->MakeCurrent();
|
|
mGL->fDeleteFences(1, &mFence);
|
|
}
|
|
}
|
|
|
|
void
|
|
SharedSurface_ANGLEShareHandle::LockProdImpl()
|
|
{
|
|
GLContextEGL::Cast(mGL)->SetEGLSurfaceOverride(mPBuffer);
|
|
}
|
|
|
|
void
|
|
SharedSurface_ANGLEShareHandle::UnlockProdImpl()
|
|
{
|
|
}
|
|
|
|
void
|
|
SharedSurface_ANGLEShareHandle::ProducerAcquireImpl()
|
|
{
|
|
if (mKeyedMutex) {
|
|
HRESULT hr = mKeyedMutex->AcquireSync(0, 10000);
|
|
if (hr == WAIT_TIMEOUT) {
|
|
MOZ_CRASH("GFX: ANGLE share handle timeout");
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
SharedSurface_ANGLEShareHandle::ProducerReleaseImpl()
|
|
{
|
|
if (mKeyedMutex) {
|
|
// XXX: ReleaseSync() has an implicit flush of the D3D commands
|
|
// whether we need Flush() or not depends on the ANGLE semantics.
|
|
// For now, we'll just do it
|
|
mGL->fFlush();
|
|
mKeyedMutex->ReleaseSync(0);
|
|
return;
|
|
}
|
|
mGL->fFinish();
|
|
}
|
|
|
|
void
|
|
SharedSurface_ANGLEShareHandle::ProducerReadAcquireImpl()
|
|
{
|
|
ProducerAcquireImpl();
|
|
}
|
|
|
|
void
|
|
SharedSurface_ANGLEShareHandle::ProducerReadReleaseImpl()
|
|
{
|
|
if (mKeyedMutex) {
|
|
mKeyedMutex->ReleaseSync(0);
|
|
return;
|
|
}
|
|
}
|
|
|
|
bool
|
|
SharedSurface_ANGLEShareHandle::ToSurfaceDescriptor(layers::SurfaceDescriptor* const out_descriptor)
|
|
{
|
|
gfx::SurfaceFormat format = mHasAlpha ? gfx::SurfaceFormat::B8G8R8A8
|
|
: gfx::SurfaceFormat::B8G8R8X8;
|
|
*out_descriptor = layers::SurfaceDescriptorD3D10((WindowsHandle)mShareHandle, format,
|
|
mSize);
|
|
return true;
|
|
}
|
|
|
|
class ScopedLockTexture final
|
|
{
|
|
public:
|
|
explicit ScopedLockTexture(ID3D11Texture2D* texture, bool* succeeded)
|
|
: mIsLocked(false)
|
|
, mTexture(texture)
|
|
{
|
|
MOZ_ASSERT(mTexture);
|
|
MOZ_ASSERT(succeeded);
|
|
*succeeded = false;
|
|
|
|
HRESULT hr;
|
|
mTexture->QueryInterface((IDXGIKeyedMutex**)getter_AddRefs(mMutex));
|
|
if (mMutex) {
|
|
hr = mMutex->AcquireSync(0, 10000);
|
|
if (hr == WAIT_TIMEOUT) {
|
|
MOZ_CRASH("GFX: ANGLE scoped lock timeout");
|
|
}
|
|
|
|
if (FAILED(hr)) {
|
|
NS_WARNING("Failed to lock the texture");
|
|
return;
|
|
}
|
|
}
|
|
|
|
ID3D11Device* device = gfxWindowsPlatform::GetPlatform()->GetD3D11Device();
|
|
device->GetImmediateContext(getter_AddRefs(mDeviceContext));
|
|
|
|
mTexture->GetDesc(&mDesc);
|
|
mDesc.BindFlags = 0;
|
|
mDesc.Usage = D3D11_USAGE_STAGING;
|
|
mDesc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
|
|
mDesc.MiscFlags = 0;
|
|
|
|
hr = device->CreateTexture2D(&mDesc, nullptr, getter_AddRefs(mCopiedTexture));
|
|
|
|
if (FAILED(hr)) {
|
|
return;
|
|
}
|
|
|
|
mDeviceContext->CopyResource(mCopiedTexture, mTexture);
|
|
|
|
hr = mDeviceContext->Map(mCopiedTexture, 0, D3D11_MAP_READ, 0, &mSubresource);
|
|
if (FAILED(hr)) {
|
|
return;
|
|
}
|
|
|
|
*succeeded = true;
|
|
mIsLocked = true;
|
|
}
|
|
|
|
~ScopedLockTexture()
|
|
{
|
|
mDeviceContext->Unmap(mCopiedTexture, 0);
|
|
if (mMutex) {
|
|
HRESULT hr = mMutex->ReleaseSync(0);
|
|
if (FAILED(hr)) {
|
|
NS_WARNING("Failed to unlock the texture");
|
|
}
|
|
}
|
|
mIsLocked = false;
|
|
}
|
|
|
|
bool mIsLocked;
|
|
RefPtr<ID3D11Texture2D> mTexture;
|
|
RefPtr<ID3D11Texture2D> mCopiedTexture;
|
|
RefPtr<IDXGIKeyedMutex> mMutex;
|
|
RefPtr<ID3D11DeviceContext> mDeviceContext;
|
|
D3D11_TEXTURE2D_DESC mDesc;
|
|
D3D11_MAPPED_SUBRESOURCE mSubresource;
|
|
};
|
|
|
|
bool
|
|
SharedSurface_ANGLEShareHandle::ReadbackBySharedHandle(gfx::DataSourceSurface* out_surface)
|
|
{
|
|
MOZ_ASSERT(out_surface);
|
|
RefPtr<ID3D11Texture2D> tex;
|
|
ID3D11Device* device = gfxWindowsPlatform::GetPlatform()->GetD3D11Device();
|
|
HRESULT hr = device->OpenSharedResource(mShareHandle,
|
|
__uuidof(ID3D11Texture2D),
|
|
(void**)(ID3D11Texture2D**)getter_AddRefs(tex));
|
|
|
|
if (FAILED(hr)) {
|
|
return false;
|
|
}
|
|
|
|
bool succeeded = false;
|
|
ScopedLockTexture scopedLock(tex, &succeeded);
|
|
if (!succeeded) {
|
|
return false;
|
|
}
|
|
|
|
const uint8_t* data = reinterpret_cast<uint8_t*>(scopedLock.mSubresource.pData);
|
|
uint32_t srcStride = scopedLock.mSubresource.RowPitch;
|
|
|
|
gfx::DataSourceSurface::ScopedMap map(out_surface, gfx::DataSourceSurface::WRITE);
|
|
if (!map.IsMapped()) {
|
|
return false;
|
|
}
|
|
|
|
if (map.GetStride() == srcStride) {
|
|
memcpy(map.GetData(), data, out_surface->GetSize().height * map.GetStride());
|
|
} else {
|
|
const uint8_t bytesPerPixel = BytesPerPixel(out_surface->GetFormat());
|
|
for (int32_t i = 0; i < out_surface->GetSize().height; i++) {
|
|
memcpy(map.GetData() + i * map.GetStride(),
|
|
data + i * srcStride,
|
|
bytesPerPixel * out_surface->GetSize().width);
|
|
}
|
|
}
|
|
|
|
DXGI_FORMAT srcFormat = scopedLock.mDesc.Format;
|
|
MOZ_ASSERT(srcFormat == DXGI_FORMAT_B8G8R8A8_UNORM ||
|
|
srcFormat == DXGI_FORMAT_B8G8R8X8_UNORM ||
|
|
srcFormat == DXGI_FORMAT_R8G8B8A8_UNORM);
|
|
bool isSrcRGB = srcFormat == DXGI_FORMAT_R8G8B8A8_UNORM;
|
|
|
|
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;
|
|
}
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// Factory
|
|
|
|
/*static*/ UniquePtr<SurfaceFactory_ANGLEShareHandle>
|
|
SurfaceFactory_ANGLEShareHandle::Create(GLContext* gl, const SurfaceCaps& caps,
|
|
const RefPtr<layers::ISurfaceAllocator>& allocator,
|
|
const layers::TextureFlags& flags)
|
|
{
|
|
GLLibraryEGL* egl = &sEGLLibrary;
|
|
if (!egl)
|
|
return nullptr;
|
|
|
|
auto ext = GLLibraryEGL::ANGLE_surface_d3d_texture_2d_share_handle;
|
|
if (!egl->IsExtensionSupported(ext))
|
|
return nullptr;
|
|
|
|
EGLConfig config = GLContextEGL::Cast(gl)->mConfig;
|
|
|
|
typedef SurfaceFactory_ANGLEShareHandle ptrT;
|
|
UniquePtr<ptrT> ret( new ptrT(gl, caps, allocator, flags, egl, config) );
|
|
return Move(ret);
|
|
}
|
|
|
|
SurfaceFactory_ANGLEShareHandle::SurfaceFactory_ANGLEShareHandle(GLContext* gl,
|
|
const SurfaceCaps& caps,
|
|
const RefPtr<layers::ISurfaceAllocator>& allocator,
|
|
const layers::TextureFlags& flags,
|
|
GLLibraryEGL* egl,
|
|
EGLConfig config)
|
|
: SurfaceFactory(SharedSurfaceType::EGLSurfaceANGLE, gl, caps, allocator, flags)
|
|
, mProdGL(gl)
|
|
, mEGL(egl)
|
|
, mConfig(config)
|
|
{ }
|
|
|
|
} /* namespace gl */
|
|
} /* namespace mozilla */
|