Improve renderer change tracking

Fix so we check context changes in the correct context Don't needlessly track context changes for Core Profile with a stencil buffer
Syphon · Oct 23, 2017 · 676effa · 676effa
1 parent f3b04cb
commit 676effa
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/SyphonServer.m b/SyphonServer.m
@@ -150,11 +150,10 @@ - (id)initWithName:(NSString*)serverName context:(CGLContextObj)context options:
         GLuint depthBufferResolution = [[self class] integerValueForKey:SyphonServerOptionDepthBufferResolution fromOptions:options];
         GLuint stencilBufferResolution = [[self class] integerValueForKey:SyphonServerOptionStencilBufferResolution fromOptions:options];
 
-        if (MSAASampleCount > 0 || stencilBufferResolution > 0)
+		if (MSAASampleCount > 0 || (stencilBufferResolution > 0 && SyphonOpenGLContextIsLegacy(context)))
         {
-            // TODO: update comment if these remain for both core and legacy GL
-            // If we have a stencil buffer we will try to use the GL_EXT_packed_depth_stencil extension
-            // so we need to know about changes to the context's abilities
+            // For MSAA we need to check we don't exceed GL_MAX_SAMPLES when the context changes
+            // If we have a stencil buffer in a Legacy context, we rely on the GL_EXT_packed_depth_stencil extension
             _wantsContextChanges = YES;
         }
 
@@ -164,7 +163,7 @@ - (id)initWithName:(NSString*)serverName context:(CGLContextObj)context options:
         if (SyphonOpenGLContextIsLegacy(context))
         {
             _renderer = [[SyphonServerRendererLegacy alloc] initWithContext:context
-                                                            MSAASampleCount:MSAASampleCount // TODO: type for this argument?
+                                                            MSAASampleCount:MSAASampleCount
                                                       depthBufferResolution:depthBufferResolution
                                                     stencilBufferResolution:stencilBufferResolution];
         }
@@ -406,7 +405,9 @@ - (BOOL)capabilitiesDidChange
     if (screen != _virtualScreen)
     {
         _virtualScreen = screen;
+        [_renderer beginInContext];
         BOOL changed = [_renderer capabilitiesDidChange];
+        [_renderer endInContext];
         SYPHONLOG(@"SyphonServer: renderer change, required capabilities %@", changed ? @"changed" : @"did not change");
         return changed;
     }