GLSupport: EGL - fix multi-window operation

OGRECave · Feb 7, 2023 · b8089b6 · b8089b6
1 parent 52bfb31
commit b8089b6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/RenderSystems/GLSupport/src/EGL/OgreEGLContext.cpp b/RenderSystems/GLSupport/src/EGL/OgreEGLContext.cpp
@@ -129,6 +129,9 @@ namespace Ogre {
 
     void EGLContext::setCurrent()
     {
+        if(eglGetCurrentSurface(EGL_DRAW) == mDrawable)
+            return;
+
         EGLBoolean ret = eglMakeCurrent(mEglDisplay,
                                         mDrawable, mDrawable, mContext);
         EGL_CHECK_ERROR

diff --git a/RenderSystems/GLSupport/src/EGL/OgreEGLWindow.cpp b/RenderSystems/GLSupport/src/EGL/OgreEGLWindow.cpp
@@ -119,7 +119,7 @@ namespace Ogre {
         {
             return;
         }
-
+        mContext->setCurrent();
         if (eglSwapBuffers(mEglDisplay, mEglSurface) == EGL_FALSE)
         {
             EGL_CHECK_ERROR

diff --git a/RenderSystems/GLSupport/src/EGL/X11/OgreX11EGLWindow.cpp b/RenderSystems/GLSupport/src/EGL/X11/OgreX11EGLWindow.cpp
@@ -268,8 +268,6 @@ namespace Ogre {
                                 "EGLWindow::create");
                 }
 
-                mEglSurface = eglGetCurrentSurface(EGL_DRAW);
-                EGL_CHECK_ERROR
                 mEglDisplay = eglGetCurrentDisplay();
                 EGL_CHECK_ERROR
             }
@@ -339,8 +337,6 @@ namespace Ogre {
             }
         }
 
-        mIsExternal = (mEglSurface != 0);
-
         if (!mEglConfig)
         {
             int minAttribs[] = {
@@ -381,10 +377,7 @@ namespace Ogre {
             mGLSupport->switchMode (width, height, frequency);
         }
 
-        if (!mIsExternal)
-        {
-            createNativeWindow(left, top, width, height, title);
-        }
+        createNativeWindow(left, top, width, height, title);
 
         mContext = createEGLContext(eglContext);
-Original file line number
+Diff line change
@@ Expand Up / @@ -119,7 +119,7 @@ namespace Ogre { @@
             {
                 return;
             }
+            mContext->setCurrent();
             if (eglSwapBuffers(mEglDisplay, mEglSurface) == EGL_FALSE)
             {
                 EGL_CHECK_ERROR
@@ Expand Down @@