Call init if current contex match context parameter

sailfishos · Apr 10, 2014 · 478aa1a · 478aa1a
1 parent 5248ab8
commit 478aa1a
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 38 deletions.
diff --git a/embedding/embedlite/EmbedLiteApp.cpp b/embedding/embedlite/EmbedLiteApp.cpp
@@ -74,9 +74,9 @@ EmbedLiteApp::~EmbedLiteApp()
 }
 
 EmbedLiteRenderTarget*
-EmbedLiteApp::CreateEmbedLiteRenderTarget()
+EmbedLiteApp::CreateEmbedLiteRenderTarget(void* aContext, void* aSurface)
 {
-  return new EmbedLiteRenderTarget(nullptr, nullptr);
+  return new EmbedLiteRenderTarget(aContext, aSurface);
 }
 
 void

diff --git a/embedding/embedlite/EmbedLiteApp.h b/embedding/embedlite/EmbedLiteApp.h
@@ -130,7 +130,7 @@ class EmbedLiteApp
   virtual void RemoveObservers(nsTArray<nsCString>& observersList);
 
   // Create wrapper for current active GL context, for proper GL sharing.
-  virtual EmbedLiteRenderTarget* CreateEmbedLiteRenderTarget();
+  virtual EmbedLiteRenderTarget* CreateEmbedLiteRenderTarget(void* aContext = nullptr, void* aSurface = nullptr);
 
   // Only one EmbedHelper object allowed
   static EmbedLiteApp* GetInstance();

diff --git a/gfx/gl/GLContextEGL.h b/gfx/gl/GLContextEGL.h
@@ -117,7 +117,7 @@ class GLContextEGL : public GLContext
 #ifdef MOZ_WIDGET_GONK
     nsRefPtr<HwcComposer2D> mHwc;
 #endif
-    bool mIsOwnContext;
+    bool mOwnsContext;
 
     static EGLSurface CreatePBufferSurfaceTryingPowerOfTwo(EGLConfig config,
                                                            EGLenum bindToTextureFormat,

diff --git a/gfx/gl/GLContextGLX.h b/gfx/gl/GLContextGLX.h
@@ -72,7 +72,7 @@ class GLContextGLX : public GLContext
     GLXLibrary* mGLX;
 
     nsRefPtr<gfxXlibSurface> mPixmap;
-    void* mIsOwnContext;
+    bool mOwnsContext;
 };
 
 }

diff --git a/gfx/gl/GLContextProviderCGL.mm b/gfx/gl/GLContextProviderCGL.mm
@@ -192,12 +192,16 @@ bool EnsureInitialized()
 already_AddRefed<GLContext>
 GLContextProviderCGL::CreateWrappingExisting(void* aContext, void* aSurface)
 {
-    NSOpenGLContext *context = aContext ? aContext : [NSOpenGLContext currentContext];
+    if (!sCGLLibrary.EnsureInitialized()) {
+        return nullptr;
+    }
+
+    NSOpenGLContext* context = (NSOpenGLContext)aContext;
     if (!context) {
         return nullptr;
     }
 
-    GLContextCGL *shareContext = GetGlobalContextCGL();
+    GLContextCGL* shareContext = GetGlobalContextCGL();
 
     // make the context transparent
     GLint opaque = 0;
@@ -207,7 +211,8 @@ bool EnsureInitialized()
     nsRefPtr<GLContextCGL> glContext = new GLContextCGL(caps,
                                                         shareContext,
                                                         context);
-    if (!glContext->Init()) {
+
+    if ([NSOpenGLContext currentContext] == context && !glContext->Init()) {
         return nullptr;
     }
 
@@ -217,10 +222,6 @@ bool EnsureInitialized()
 already_AddRefed<GLContext>
 GLContextProviderCGL::CreateForWindow(nsIWidget *aWidget)
 {
-    if (!sCGLLibrary.EnsureInitialized()) {
-        return nullptr;
-    }
-
     GLContextCGL *shareContext = GetGlobalContextCGL();
 
     NSOpenGLContext *context = [[NSOpenGLContext alloc]

diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp
@@ -234,7 +234,7 @@ GLContextEGL::GLContextEGL(
     , mIsDoubleBuffered(false)
     , mCanBindToTexture(false)
     , mShareWithEGLImage(false)
-    , mIsOwnContext(true)
+    , mOwnsContext(true)
 {
     // any EGL contexts will always be GLESv2
     SetProfileVersion(ContextProfile::OpenGLES, 200);
@@ -262,7 +262,7 @@ GLContextEGL::~GLContextEGL()
     // If mGLWidget is non-null, then we've been given it by the GL context provider,
     // and it's managed by the widget implementation. In this case, We can't destroy
     // our contexts.
-    if (!mIsOwnContext)
+    if (!mOwnsContext)
         return;
 
 #ifdef DEBUG
@@ -429,7 +429,7 @@ GLContextEGL::RenewSurface() {
 
 void
 GLContextEGL::ReleaseSurface() {
-    if (mIsOwnContext) {
+    if (mOwnsContext) {
         DestroySurface(mSurface);
     }
     mSurface = EGL_NO_SURFACE;
@@ -445,7 +445,7 @@ GLContextEGL::SetupLookupFunction()
 bool
 GLContextEGL::SwapBuffers()
 {
-    if (mSurface && mIsOwnContext) {
+    if (mSurface && mOwnsContext) {
 #ifdef MOZ_WIDGET_GONK
         if (!mIsOffscreen) {
             if (mHwc) {
@@ -691,18 +691,22 @@ GLContextProviderEGL::CreateWrappingExisting(void* aContext, void* aSurface)
         return nullptr;
     }
 
-    EGLContext eglContext = aContext ? (EGLContext)aContext : sEGLLibrary.fGetCurrentContext();
-    EGLSurface eglSurface = aSurface ? (EGLSurface)aSurface : sEGLLibrary.fGetCurrentSurface(LOCAL_EGL_DRAW);
-    if (eglContext && eglSurface) {
+    if (aContext && aSurface) {
         SurfaceCaps caps = SurfaceCaps::Any();
         EGLConfig config = EGL_NO_CONFIG;
         nsRefPtr<GLContextEGL> glContext =
             new GLContextEGL(caps,
                              nullptr, false,
-                             config, eglSurface, eglContext);
+                             config, (EGLSurface)aSurface, (EGLContext)aContext);
 
         glContext->SetIsDoubleBuffered(true);
-        glContext->mIsOwnContext = false;
+        glContext->mOwnsContext = false;
+
+        if (sEGLLibrary.fGetCurrentContext() == aContext) {
+            if (!glContext->Init()) {
+                NS_WARNING("Failed to initialize wrapping EGL context");
+            }
+        }
 
         return glContext.forget();
     }

diff --git a/gfx/gl/GLContextProviderGLX.cpp b/gfx/gl/GLContextProviderGLX.cpp
@@ -834,7 +834,7 @@ GLContextGLX::~GLContextGLX()
 {
     MarkDestroyed();
 
-    if (!mIsOwnContext)
+    if (!mOwnsContext)
         return;
 
     // see bug 659842 comment 76
@@ -916,7 +916,7 @@ GLContextGLX::SupportsRobustness() const
 bool
 GLContextGLX::SwapBuffers()
 {
-    if (!mDoubleBuffered || !mIsOwnContext)
+    if (!mDoubleBuffered || !mOwnsContext)
         return false;
     mGLX->xSwapBuffers(mDisplay, mDrawable);
     mGLX->xWaitGL();
@@ -941,7 +941,7 @@ GLContextGLX::GLContextGLX(
       mDoubleBuffered(aDoubleBuffered),
       mGLX(&sGLXLibrary),
       mPixmap(aPixmap),
-      mIsOwnContext(true)
+      mOwnsContext(true)
 {
     MOZ_ASSERT(mGLX);
     // See 899855
@@ -978,14 +978,14 @@ AreCompatibleVisuals(Visual *one, Visual *two)
 static nsRefPtr<GLContext> gGlobalContext;
 
 already_AddRefed<GLContext>
-GLContextProviderGLX::CreateForEmbedded(void* aContext, void* aSurface)
+GLContextProviderGLX::CreateWrappingExisting(void* aContext, void* aSurface)
 {
     if (!sGLXLibrary.EnsureInitialized()) {
         return nullptr;
     }
 
-    GLXContext glxContext = aContext ? (GLXContext)aContext : sGLXLibrary.xGetCurrentContext();
-    GLXDrawable glxDrawable = aSurface ? (GLXDrawable)aSurface : (GLXDrawable)sGLXLibrary.xGetCurrentDrawable();
+    GLXContext glxContext = (GLXContext)aContext;
+    GLXDrawable glxDrawable = (GLXDrawable)aSurface;
     if (glxContext && glxDrawable) {
         SurfaceCaps caps = SurfaceCaps::Any();
         nsRefPtr<GLContextGLX> glContext =
@@ -998,9 +998,16 @@ GLContextProviderGLX::CreateForEmbedded(void* aContext, void* aSurface)
                              true,
                              (gfxXlibSurface*)nullptr);
 
-        glContext->mIsOwnContext = false;
+        glContext->mOwnsContext = false;
         gGlobalContext = glContext;
 
+        if (sGLXLibrary.xGetCurrentContext() == aContext) {
+            if (!glContext->Init()) {
+                NS_WARNING("[GLX] Failed to initialize wrapping context");
+                return nullptr;
+            }
+        }
+
         return glContext.forget();
     }
 

diff --git a/gfx/gl/GLContextProviderWGL.cpp b/gfx/gl/GLContextProviderWGL.cpp
@@ -413,23 +413,20 @@ GLContextProviderWGL::CreateWrappingExisting(void* aContext, void* aSurface)
        * wglCreateContext will fail.
        */
 
-    HGLRC context = aContext ? (HGLRC)aContext : sWGLLib.fGetCurrentContext()
-    HDC dc = aSurface ? (HDC)aSurface : 0;
-
-    GLContextWGL *shareContext = GetGlobalContextWGL();
-
-
-    if (!context) {
+    if (!aContext) {
         return nullptr;
     }
 
+    GLContextWGL *shareContext = GetGlobalContextWGL();
+
     SurfaceCaps caps = SurfaceCaps::ForRGBA();
     nsRefPtr<GLContextWGL> glContext = new GLContextWGL(caps,
                                                         shareContext,
                                                         false,
-                                                        dc,
-                                                        context);
-    if (!glContext->Init()) {
+                                                        (HDC)aSurface,
+                                                        (HGLRC)aContext);
+
+    if (sWGLLib.fGetCurrentContext() == aContext && !glContext->Init()) {
         return nullptr;
     }