move InitExtensions after EglMakeCurrent (#1589)

* update comments * InitExtensions after EglMakeCurrent
kniEngine · May 21, 2024 · 28462ff · 28462ff
1 parent f25510d
commit 28462ff
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/MonoGame.Framework/Platform/Android/AndroidSurfaceView.cs b/MonoGame.Framework/Platform/Android/AndroidSurfaceView.cs
@@ -278,6 +278,10 @@ void ProcessStateResumed()
                         if (!GL.Egl.EglMakeCurrent(adapter.EglDisplay, _eglSurface, _eglSurface, _eglContext))
                             throw new Exception("Could not make EGL current" + GL.GetEglErrorAsString());
 
+                        // OGL.InitExtensions() must be called while we have a current gl context.
+                        if (OGL_DROID.Current.Extensions == null)
+                            OGL_DROID.Current.InitExtensions();
+
                         GraphicsDeviceManager gdm = ((IPlatformGame)_game).GetStrategy<ConcreteGame>().GraphicsDeviceManager;
                         if (gdm != null)
                         {
@@ -291,10 +295,6 @@ void ProcessStateResumed()
                         }
                     }
 
-                    // OGL.InitExtensions() must be called while we have a gl context.
-                    if (OGL_DROID.Current.Extensions == null)
-                        OGL_DROID.Current.InitExtensions();
-
                     if (_isGLContextLost)
                     {
                         // we lost the gl context, we need to let the programmer

diff --git a/MonoGame.Framework/Platform/Cardboard/AndroidSurfaceView.cs b/MonoGame.Framework/Platform/Cardboard/AndroidSurfaceView.cs
@@ -222,11 +222,15 @@ void ProcessStateResumed()
                             throw new Exception("Could not create EGL window surface" + GL.GetEglErrorAsString());
                         */
 
-                        /* Cardboard: Surface was created by GLSurfaceView.
+                        /* Cardboard: Context was created by GLSurfaceView.
                         if (!GL.Egl.EglMakeCurrent(adapter.EglDisplay, _eglSurface, _eglSurface, _eglContext))
                             throw new Exception("Could not make EGL current" + GL.GetEglErrorAsString());
                         */
 
+                        // OGL.InitExtensions() must be called while we have a current gl context.
+                        if (OGL_DROID.Current.Extensions == null)
+                            OGL_DROID.Current.InitExtensions();
+
                         GraphicsDeviceManager gdm = ((IPlatformGame)_game).GetStrategy<ConcreteGame>().GraphicsDeviceManager;
                         if (gdm != null)
                         {
@@ -240,10 +244,6 @@ void ProcessStateResumed()
                         }
                     }
 
-                    // OGL.InitExtensions() must be called while we have a gl context.
-                    if (OGL_DROID.Current.Extensions == null)
-                        OGL_DROID.Current.InitExtensions();
-
                     if (_isGLContextLost)
                     {
                         // we lost the gl context, we need to let the programmer
@@ -262,7 +262,7 @@ void ProcessStateResumed()
                         throw new Exception("Could not create EGL window surface" + GL.GetEglErrorAsString());
                     */
 
-                    /* Cardboard: Surface was created by GLSurfaceView.
+                    /* Cardboard: Context was created by GLSurfaceView.
                     if (!GL.Egl.EglMakeCurrent(adapter.EglDisplay, _eglSurface, _eglSurface, _eglContext))
                         throw new Exception("Could not make EGL current" + GL.GetEglErrorAsString());
                     */
@@ -503,10 +503,11 @@ void IRenderer.OnDrawFrame(VRCardboard.HeadTransform headTransform, VRCardboard.
                 _eglContext = GL.Egl.EglGetCurrentContext();
                 if (_eglContext == EGL10.EglNoContext)
                     _eglContext = null;
-            }
 
-            if (OGL_DROID.Current.Extensions == null)
-                OGL_DROID.Current.InitExtensions();
+                // OGL.InitExtensions() must be called while we have a current gl context.
+                if (OGL_DROID.Current.Extensions == null)
+                    OGL_DROID.Current.InitExtensions();
+            }
 
             if (!_isStarted)
                 return;