Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1413230 - Ensure we are attached to the GL context in SurfaceTextureHostOGL::PrepareTextureSource() r=jnicol,nical

Browse Source 
MozReview-Commit-ID: BxDng9OG3RF
This commit is contained in:
James Willcox 2017-10-31 11:07:53 -05:00
parent 6931291fc3
commit bc001da86a
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gfx/layers/opengl/TextureHostOGL.cpp
View File

@ -453,12 +453,11 @@ SurfaceTextureHost::~SurfaceTextureHost()
void void
SurfaceTextureHost::PrepareTextureSource(CompositableTextureSourceRef& aTexture) SurfaceTextureHost::PrepareTextureSource(CompositableTextureSourceRef& aTexture)
{ {
GLContext* gl = this->gl();
if (!gl || !gl->MakeCurrent()) {
return;
}
if (!mContinuousUpdate && mSurfTex) { if (!mContinuousUpdate && mSurfTex) {
if (!EnsureAttached()) {
return;
}
// UpdateTexImage() advances the internal buffer queue, so we only want to call this // UpdateTexImage() advances the internal buffer queue, so we only want to call this
// once per transactionwhen we are not in continuous mode (as we are here). Otherwise, // once per transactionwhen we are not in continuous mode (as we are here). Otherwise,
// the SurfaceTexture content will be de-synced from the rest of the page in subsequent // the SurfaceTexture content will be de-synced from the rest of the page in subsequent
@ -474,14 +473,32 @@ SurfaceTextureHost::gl() const
} }
bool bool
SurfaceTextureHost::Lock() SurfaceTextureHost::EnsureAttached()
{ {
GLContext* gl = this->gl();
if (!gl || !gl->MakeCurrent()) {
return false;
}
if (!mSurfTex) { if (!mSurfTex) {
return false; return false;
} }
GLContext* gl = this->gl(); if (!mSurfTex->IsAttachedToGLContext((int64_t)gl)) {
if (!gl || !gl->MakeCurrent()) { GLuint texName;
gl->fGenTextures(1, &texName);
if (NS_FAILED(mSurfTex->AttachToGLContext((int64_t)gl, texName))) {
return false;
}
}
return true;
}
bool
SurfaceTextureHost::Lock()
{
if (!EnsureAttached()) {
return false; return false;
} }
@ -501,14 +518,6 @@ SurfaceTextureHost::Lock()
mIgnoreTransform); mIgnoreTransform);
} }
if (!mSurfTex->IsAttachedToGLContext((int64_t)gl)) {
GLuint texName;
gl->fGenTextures(1, &texName);
if (NS_FAILED(mSurfTex->AttachToGLContext((int64_t)gl, texName))) {
return false;
}
}
return true; return true;
} }

2
gfx/layers/opengl/TextureHostOGL.h
View File

@ -429,6 +429,8 @@ public:
virtual const char* Name() override { return "SurfaceTextureHost"; } virtual const char* Name() override { return "SurfaceTextureHost"; }
protected: protected:
bool EnsureAttached();
mozilla::java::GeckoSurfaceTexture::GlobalRef mSurfTex; mozilla::java::GeckoSurfaceTexture::GlobalRef mSurfTex;
const gfx::IntSize mSize; const gfx::IntSize mSize;
const gfx::SurfaceFormat mFormat; const gfx::SurfaceFormat mFormat;