mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
d041f9bde0
- Bug 1149728. Move CreateXForOffscreen functions. r=jrmuizel (87d69e4b7c) - missing part of Bug 1179280. Update ANGLE (ee6228fa90) - missing bit of Bug 1191042 - Use CreateOffscreen for WebGL instead of CreateHeadless. - r=jrmuizel (87c26edf2c) - add back XP bits (f198a909bd) - put back SQLITE_ENABLE_DBSTAT_VTAB checks (a06fd5b7a9) - Bug 1197387 - Use glXGetProcAddress to link against GLX_ARB_create_context_robustness. r=jgilbert (651b85207d) - add back feature report (a0a33bb8e5) - Bug 1209022 - Fix AA handling in EGL's CreateOffscreen. - r=jrmuizel (64d4e0f65a) - Bug 1171228 - Expose WEBGL_debug_renderer_info to web content on non-RELEASE_BUILDs. - r=kamidphish, sr=jst (e7405ef944) - Bug 1175257 - Remove the fails-if(B2G) annotation on capturestream.html. (80bf24c623) - Bug 1177726 - Inflate the bounds when stroking the canvas text. r=jmuizelaar (15969cb828) - Bug 1183363 - Make EnsureWritablePath and EnsureUserSpacePath always imply EnsureTarget. r=Basimply EnsureTarget. r=Bas (12d825cf30) - Bug 1183363 - Add canvas crashtest. r=Bas (69b6099607) - Bug 1186689 - check for OOM on destination array before mapping source to avoid needing unmap. r=bas (7a3ed105d6) - Bug 1206161 - Make sure the DrawTarget is available when creating a CanvasLayer so that we can check for SkiaGL. r=Bas (fdf15fd552) - Bug 232227 - Do not expose system colors to CSS or canvas. r=jmuizelaar r=enndeakin tor-r=arthuredelstein (dfd6f07fd8) - Bug 1209206 (part 1) - Remove mgfx namespace synonym. (5916056863) - Bug 1209206 (part 2) - Rename and re-comment HasNonOpaqueColor(). r=jdaggett. (768a0d549b) - Bug 1209206 (part 3) - Use sinf() and cosf() instead of sin() and cos() in a couple of places. r=Bas. (7af9ebaa7f) - No bug - Remove outdated comment and additional comment questioning its relevance. r=me DONTBUILD (6f7eca8452) - Bug 1145934 - Update obsolete glyph-run assertion. r=jdaggett (ce2442e64b) - Bug 1182361 p1 - move old generic lookup methods into gfxPangoFontGroup. r=heycam (ef39e6fd52) - Bug 1182361 p2 - count generic lookups. r=heycam (53050ad6e8) - bug 1180010 make some methods protected and non-virtual r=jdaggett (815e503481) - Bug 1165179 - use all style matched faces within a font family. r=heycam (d2711db48b) - Bug 1182361 p3 - move generic lookup methods to platform fontlist. r=heycam (63b974a000) - Bug 1182361 p4 - move pref font util methods to platform fontlist. r=heycam (23d7352442) - Bug 1182361 p5 - cache pref fonts per langGroup. r=heycam (c4244432cb) - Bug 1182361 p6 - eliminate old pref font caching. r=heycam (c5293f0b8d) - Bug 1182361 p7 - fixups based on review comments. r=heycam (51a2204179) - Bug 1170688 - Move initialization of text-run parameters until *after* the draw target has been updated; r=jfkthame (e523ff6e96) - Bug 1157629 - Fix uninitialized member warning in BufferAlphaColor. r=jdaggett (a564effd24) - Bug 1184282 - Remove break suggested inside cluster warning. r=roc (54da46a09f) - Bug 1197650 - remove duplicate validity check for newly created fonts. r=m_kato (5ffb28a313) - Bug 1171357 - log font matching for textruns. r=m_kato (2354cd36f6) - Bug 1185812 - rejigger the ordering of fonts within a family to avoid obscure faces. r=heycam (0518f4ef64) - Bug 1167697 - Mark refs to gfxFontEntry in UserFontCache as MOZ_NON_OWNING_REF. r=jtd (1fdcccdac2) - bits of Bug 1073209 - Eliminate usage of CreateSamplingRestrictedDrawable (9058557527) - and sync gfx/gl to same state as af-frontend branch
315 lines
9.1 KiB
C++
315 lines
9.1 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::Fence()
|
|
{
|
|
mGL->fFinish();
|
|
}
|
|
|
|
bool
|
|
SharedSurface_ANGLEShareHandle::WaitSync()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
SharedSurface_ANGLEShareHandle::PollSync()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
void
|
|
SharedSurface_ANGLEShareHandle::ProducerAcquireImpl()
|
|
{
|
|
if (mKeyedMutex) {
|
|
HRESULT hr = mKeyedMutex->AcquireSync(0, 10000);
|
|
if (hr == WAIT_TIMEOUT) {
|
|
MOZ_CRASH();
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
SharedSurface_ANGLEShareHandle::ProducerReleaseImpl()
|
|
{
|
|
if (mKeyedMutex) {
|
|
GLLibraryEGL* egl = &sEGLLibrary;
|
|
mGL->fFlush();
|
|
egl->fSurfaceReleaseSyncANGLE(mEGL->Display(), mPBuffer);
|
|
// 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
|
|
mKeyedMutex->ReleaseSync(0);
|
|
return;
|
|
}
|
|
Fence();
|
|
}
|
|
|
|
void
|
|
SharedSurface_ANGLEShareHandle::ProducerReadAcquireImpl()
|
|
{
|
|
ProducerAcquireImpl();
|
|
}
|
|
|
|
void
|
|
SharedSurface_ANGLEShareHandle::ProducerReadReleaseImpl()
|
|
{
|
|
if (mKeyedMutex) {
|
|
mKeyedMutex->ReleaseSync(0);
|
|
return;
|
|
}
|
|
}
|
|
|
|
void
|
|
SharedSurface_ANGLEShareHandle::ConsumerAcquireImpl()
|
|
{
|
|
if (!mConsumerTexture) {
|
|
RefPtr<ID3D11Texture2D> tex;
|
|
HRESULT hr = gfxWindowsPlatform::GetPlatform()->GetD3D11Device()->OpenSharedResource(mShareHandle,
|
|
__uuidof(ID3D11Texture2D),
|
|
(void**)(ID3D11Texture2D**)byRef(tex));
|
|
if (SUCCEEDED(hr)) {
|
|
mConsumerTexture = tex;
|
|
RefPtr<IDXGIKeyedMutex> mutex;
|
|
hr = tex->QueryInterface((IDXGIKeyedMutex**)byRef(mutex));
|
|
|
|
if (SUCCEEDED(hr)) {
|
|
mConsumerKeyedMutex = mutex;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (mConsumerKeyedMutex) {
|
|
HRESULT hr = mConsumerKeyedMutex->AcquireSync(0, 10000);
|
|
if (hr == WAIT_TIMEOUT) {
|
|
MOZ_CRASH();
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
SharedSurface_ANGLEShareHandle::ConsumerReleaseImpl()
|
|
{
|
|
if (mConsumerKeyedMutex) {
|
|
mConsumerKeyedMutex->ReleaseSync(0);
|
|
}
|
|
}
|
|
|
|
void
|
|
SharedSurface_ANGLEShareHandle::Fence_ContentThread_Impl()
|
|
{
|
|
if (mFence) {
|
|
MOZ_ASSERT(mGL->IsExtensionSupported(GLContext::NV_fence));
|
|
mGL->fSetFence(mFence, LOCAL_GL_ALL_COMPLETED_NV);
|
|
mGL->fFlush();
|
|
return;
|
|
}
|
|
|
|
Fence();
|
|
}
|
|
|
|
bool
|
|
SharedSurface_ANGLEShareHandle::WaitSync_ContentThread_Impl()
|
|
{
|
|
if (mFence) {
|
|
mGL->MakeCurrent();
|
|
mGL->fFinishFence(mFence);
|
|
return true;
|
|
}
|
|
|
|
return WaitSync();
|
|
}
|
|
|
|
bool
|
|
SharedSurface_ANGLEShareHandle::PollSync_ContentThread_Impl()
|
|
{
|
|
if (mFence) {
|
|
mGL->MakeCurrent();
|
|
return mGL->fTestFence(mFence);
|
|
}
|
|
|
|
return PollSync();
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// 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 */
|