зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1285044 - Remove unused NV_fence from ShSurfANGLE. - r=mtseng
MozReview-Commit-ID: LhYzgGdOVEq
This commit is contained in:
Родитель
be283d9539
Коммит
b5ca635c39
|
@ -72,15 +72,9 @@ SharedSurface_ANGLEShareHandle::Create(GLContext* gl, EGLConfig config,
|
|||
&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) );
|
||||
keyedMutex) );
|
||||
return Move(ret);
|
||||
}
|
||||
|
||||
|
@ -96,8 +90,7 @@ SharedSurface_ANGLEShareHandle::SharedSurface_ANGLEShareHandle(GLContext* gl,
|
|||
bool hasAlpha,
|
||||
EGLSurface pbuffer,
|
||||
HANDLE shareHandle,
|
||||
const RefPtr<IDXGIKeyedMutex>& keyedMutex,
|
||||
GLuint fence)
|
||||
const RefPtr<IDXGIKeyedMutex>& keyedMutex)
|
||||
: SharedSurface(SharedSurfaceType::EGLSurfaceANGLE,
|
||||
AttachmentType::Screen,
|
||||
gl,
|
||||
|
@ -108,7 +101,6 @@ SharedSurface_ANGLEShareHandle::SharedSurface_ANGLEShareHandle(GLContext* gl,
|
|||
, mPBuffer(pbuffer)
|
||||
, mShareHandle(shareHandle)
|
||||
, mKeyedMutex(keyedMutex)
|
||||
, mFence(fence)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -116,13 +108,6 @@ SharedSurface_ANGLEShareHandle::SharedSurface_ANGLEShareHandle(GLContext* gl,
|
|||
SharedSurface_ANGLEShareHandle::~SharedSurface_ANGLEShareHandle()
|
||||
{
|
||||
mEGL->fDestroySurface(Display(), mPBuffer);
|
||||
|
||||
if (!mGL->MakeCurrent())
|
||||
return;
|
||||
|
||||
if (mFence) {
|
||||
mGL->fDeleteFences(1, &mFence);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -40,7 +40,6 @@ public:
|
|||
const HANDLE mShareHandle;
|
||||
protected:
|
||||
RefPtr<IDXGIKeyedMutex> mKeyedMutex;
|
||||
const GLuint mFence;
|
||||
|
||||
SharedSurface_ANGLEShareHandle(GLContext* gl,
|
||||
GLLibraryEGL* egl,
|
||||
|
@ -48,8 +47,7 @@ protected:
|
|||
bool hasAlpha,
|
||||
EGLSurface pbuffer,
|
||||
HANDLE shareHandle,
|
||||
const RefPtr<IDXGIKeyedMutex>& keyedMutex,
|
||||
GLuint fence);
|
||||
const RefPtr<IDXGIKeyedMutex>& keyedMutex);
|
||||
|
||||
EGLDisplay Display();
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче