Merge pull request #1097 from iPlug2/graphics/gl-context

Activate and Deactivate GL context
iPlug2 · May 20, 2024 · 6c639b9 · 6c639b9
2 parents 34b7101 + b189eb3
commit 6c639b9
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 3 deletions.
diff --git a/IGraphics/Drawing/IGraphicsNanoVG.cpp b/IGraphics/Drawing/IGraphicsNanoVG.cpp
@@ -480,6 +480,8 @@ void IGraphicsNanoVG::OnViewDestroyed()
 
 void IGraphicsNanoVG::DrawResize()
 {
+  ActivateGLContext();
+
   if (mMainFrameBuffer != nullptr)
     nvgDeleteFramebuffer(mMainFrameBuffer);
 
@@ -490,6 +492,8 @@ void IGraphicsNanoVG::DrawResize()
     if (mMainFrameBuffer == nullptr)
       DBGMSG("Could not init FBO.\n");
   }
+
+  DeactivateGLContext();
 }
 
 void IGraphicsNanoVG::BeginFrame()

diff --git a/IGraphics/IGraphics.h b/IGraphics/IGraphics.h
@@ -971,10 +971,10 @@ class IGraphics
   virtual const char* GetAppGroupID() const { return ""; }
 
 protected:
-  /* Implemented on Windows to store previously active GLContext and HDC for restoring, calls GetDC */
-  virtual void ActivateGLContext() {}; 
+  /* Activate the context for the view (GL only) */
+  virtual void ActivateGLContext() {};
 
-  /* Implemented on Windows to restore previous GL context calls ReleaseDC */
+  /* Deactivate the context for the view (GL only) */
   virtual void DeactivateGLContext() {};
 
   /** Creates a platform native text entry field.

diff --git a/IGraphics/Platforms/IGraphicsMac.h b/IGraphics/Platforms/IGraphicsMac.h
@@ -78,6 +78,10 @@ class IGraphicsMac final : public IGRAPHICS_DRAW_CLASS
 
   IPopupMenu* CreatePlatformPopupMenu(IPopupMenu& menu, const IRECT bounds, bool& isAsync) override;
   void CreatePlatformTextEntry(int paramIdx, const IText& text, const IRECT& bounds, int length, const char* str) override;
+
+  void ActivateGLContext() override;
+  void DeactivateGLContext() override;
+
 private:
   void PointToScreen(float& x, float& y) const;
   void ScreenToPoint(float& x, float& y) const;

diff --git a/IGraphics/Platforms/IGraphicsMac.mm b/IGraphics/Platforms/IGraphicsMac.mm
@@ -725,6 +725,21 @@ static int GetSystemVersion()
   return EUIAppearance::Light;
 }
 
+void IGraphicsMac::ActivateGLContext()
+{
+#ifdef IGRAPHICS_GL
+  IGRAPHICS_VIEW* pView = (IGRAPHICS_VIEW*) mView;
+  [[pView openGLContext] makeCurrentContext];
+#endif
+}
+
+void IGraphicsMac::DeactivateGLContext()
+{
+#ifdef IGRAPHICS_GL
+  [NSOpenGLContext clearCurrentContext];
+#endif
+}
+
 #if defined IGRAPHICS_NANOVG
   #include "IGraphicsNanoVG.cpp"
 #elif defined IGRAPHICS_SKIA

diff --git a/IGraphics/Platforms/IGraphicsMac_view.mm b/IGraphics/Platforms/IGraphicsMac_view.mm
@@ -580,6 +580,12 @@ - (void) viewDidMoveToWindow
                                                  name:NSViewFrameDidChangeNotification
                                                object:self];
     #endif
+    #ifdef IGRAPHICS_GL
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(frameDidChange:)
+                                                 name:NSViewGlobalFrameDidChangeNotification
+                                               object:self];
+    #endif
 
 //    [[NSNotificationCenter defaultCenter] addObserver:self
 //                                             selector:@selector(windowResized:) name:NSWindowDidEndLiveResizeNotification
@@ -670,6 +676,7 @@ - (void) render
     #endif
     #ifdef IGRAPHICS_GL
     [[self openGLContext] flushBuffer];
+    [NSOpenGLContext clearCurrentContext];
     #endif
   }
 }
@@ -1299,6 +1306,12 @@ - (void) frameDidChange:(NSNotification*) pNotification
                                                           self.frame.size.height * scale)];
 }
 #endif
+#ifdef IGRAPHICS_GL
+- (void) frameDidChange:(NSNotification*) pNotification
+{
+  [[self openGLContext] makeCurrentContext];
+}
+#endif
 
 //- (void) windowResized: (NSNotification*) notification;
 //{