Revert "Move more Mac UI-thread-only calls to main thread"

This reverts commit 9302fa6fe4a6b78d74125c52f753d2af219cc5a5.

src/glcontext_nsgl.mm

@@ -70,112 +70,82 @@ namespace bgfx { namespace gl
 		NSObject* nwh = (NSObject*)g_platformData.nwh;
 		m_context = g_platformData.context;
 
-		if (NULL == g_platformData.context)
+		NSWindow* nsWindow = nil;
+		NSView* contentView = nil;
+		if ([nwh isKindOfClass:[NSView class]])
 		{
-			void (^createContext)(NSOpenGLView**, NSOpenGLContext**) = ^(NSOpenGLView** glViewOut, NSOpenGLContext** glContextOut) {
-				NSWindow* nsWindow = nil;
-				NSView* contentView = nil;
-
-				if ([nwh isKindOfClass:[NSView class]])
-				{
-					contentView = (NSView*)nwh;
-				}
-				else if ([nwh isKindOfClass:[NSWindow class]])
-				{
-					nsWindow = (NSWindow*)nwh;
-					contentView = [nsWindow contentView];
-				}
-
-	#if defined(MAC_OS_X_VERSION_MAX_ALLOWED) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070)
-				NSOpenGLPixelFormatAttribute profile =
-	#if BGFX_CONFIG_RENDERER_OPENGL >= 31
-					NSOpenGLProfileVersion3_2Core
-	#else
-					NSOpenGLProfileVersionLegacy
-	#endif // BGFX_CONFIG_RENDERER_OPENGL >= 31
-					;
-	#endif // defined(MAC_OS_X_VERSION_MAX_ALLOWED) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070)
-
-				NSOpenGLPixelFormatAttribute pixelFormatAttributes[] = {
-	#if defined(MAC_OS_X_VERSION_MAX_ALLOWED) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070)
-					NSOpenGLPFAOpenGLProfile, profile,
-	#endif // defined(MAC_OS_X_VERSION_MAX_ALLOWED) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070)
-					NSOpenGLPFAColorSize,     24,
-					NSOpenGLPFAAlphaSize,     8,
-					NSOpenGLPFADepthSize,     24,
-					NSOpenGLPFAStencilSize,   8,
-					NSOpenGLPFADoubleBuffer,  true,
-					NSOpenGLPFAAccelerated,   true,
-					NSOpenGLPFANoRecovery,    true,
-					0,                        0,
-				};
-
-				NSOpenGLPixelFormat* pixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:pixelFormatAttributes];
-				BGFX_FATAL(NULL != pixelFormat, Fatal::UnableToInitialize, "Failed to initialize pixel format.");
-
-				NSRect glViewRect = [contentView bounds];
-				NSOpenGLView* glView = [[NSOpenGLView alloc] initWithFrame:glViewRect pixelFormat:pixelFormat];
-
-				[pixelFormat release];
-				// GLFW creates a helper contentView that handles things like keyboard and drag and
-				// drop events. We don't want to clobber that view if it exists. Instead we just
-				// add ourselves as a subview and make the view resize automatically.
-				if (nil != contentView)
-				{
-					[glView setAutoresizingMask:( NSViewHeightSizable |
-							NSViewWidthSizable |
-							NSViewMinXMargin |
-							NSViewMaxXMargin |
-							NSViewMinYMargin |
-							NSViewMaxYMargin )];
-					[contentView addSubview:glView];
-				}
-				else
-				{
-					if (nil != nsWindow)
-						[nsWindow setContentView:glView];
-				}
-
-				NSOpenGLContext* glContext = [glView openGLContext];
-				BGFX_FATAL(NULL != glContext, Fatal::UnableToInitialize, "Failed to initialize GL context.");
-
-				[glContext makeCurrentContext];
-				GLint interval = 0;
-				[glContext setValues:&interval forParameter:NSOpenGLCPSwapInterval];
+			contentView = (NSView*)nwh;
+		}
+		else if ([nwh isKindOfClass:[NSWindow class]])
+		{
+			nsWindow = (NSWindow*)nwh;
+			contentView = [nsWindow contentView];
+		}
 
-				// When initializing NSOpenGLView programatically (as we are), this sometimes doesn't
-				// get hooked up properly (especially when there are existing window elements). This ensures
-				// we are valid. Otherwise, you'll probably get a GL_INVALID_FRAMEBUFFER_OPERATION when
-				// trying to glClear() for the first time.
-				[glContext setView:glView];
+		if (NULL == g_platformData.context)
+		{
+#if defined(MAC_OS_X_VERSION_MAX_ALLOWED) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070)
+			NSOpenGLPixelFormatAttribute profile =
+#if BGFX_CONFIG_RENDERER_OPENGL >= 31
+				NSOpenGLProfileVersion3_2Core
+#else
+				NSOpenGLProfileVersionLegacy
+#endif // BGFX_CONFIG_RENDERER_OPENGL >= 31
+				;
+#endif // defined(MAC_OS_X_VERSION_MAX_ALLOWED) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070)
 
-				*glContextOut = glContext;
-				*glViewOut = glView;
+			NSOpenGLPixelFormatAttribute pixelFormatAttributes[] = {
+#if defined(MAC_OS_X_VERSION_MAX_ALLOWED) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070)
+				NSOpenGLPFAOpenGLProfile, profile,
+#endif // defined(MAC_OS_X_VERSION_MAX_ALLOWED) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070)
+				NSOpenGLPFAColorSize,     24,
+				NSOpenGLPFAAlphaSize,     8,
+				NSOpenGLPFADepthSize,     24,
+				NSOpenGLPFAStencilSize,   8,
+				NSOpenGLPFADoubleBuffer,  true,
+				NSOpenGLPFAAccelerated,   true,
+				NSOpenGLPFANoRecovery,    true,
+				0,                        0,
 			};
 
-			NSOpenGLContext* glContext = nil;
-			NSOpenGLView* glView = nil;
+			NSOpenGLPixelFormat* pixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:pixelFormatAttributes];
+			BGFX_FATAL(NULL != pixelFormat, Fatal::UnableToInitialize, "Failed to initialize pixel format.");
 
-			if ([NSThread isMainThread])
+			NSRect glViewRect = [contentView bounds];
+			NSOpenGLView* glView = [[NSOpenGLView alloc] initWithFrame:glViewRect pixelFormat:pixelFormat];
+
+			[pixelFormat release];
+			// GLFW creates a helper contentView that handles things like keyboard and drag and
+			// drop events. We don't want to clobber that view if it exists. Instead we just
+			// add ourselves as a subview and make the view resize automatically.
+			if (nil != contentView)
 			{
-				createContext(&glView, &glContext);
+				[glView setAutoresizingMask:( NSViewHeightSizable |
+						NSViewWidthSizable |
+						NSViewMinXMargin |
+						NSViewMaxXMargin |
+						NSViewMinYMargin |
+						NSViewMaxYMargin )];
+				[contentView addSubview:glView];
 			}
 			else
 			{
-				bx::Semaphore semaphore;
-				bx::Semaphore* psemaphore = &semaphore;
-
-				CFRunLoopPerformBlock([[NSRunLoop mainRunLoop] getCFRunLoop],
-										kCFRunLoopCommonModes,
-										^{
-											// cast our const away because we're immediately coming back to this thread
-											createContext((NSOpenGLView**)&glView, (NSOpenGLContext**)&glContext);
-											psemaphore->post();
-										});
-				semaphore.wait();
+				if (nil != nsWindow)
+					[nsWindow setContentView:glView];
 			}
 
+			NSOpenGLContext* glContext = [glView openGLContext];
+			BGFX_FATAL(NULL != glContext, Fatal::UnableToInitialize, "Failed to initialize GL context.");
+
 			[glContext makeCurrentContext];
+			GLint interval = 0;
+			[glContext setValues:&interval forParameter:NSOpenGLCPSwapInterval];
+
+			// When initializing NSOpenGLView programatically (as we are), this sometimes doesn't
+			// get hooked up properly (especially when there are existing window elements). This ensures
+			// we are valid. Otherwise, you'll probably get a GL_INVALID_FRAMEBUFFER_OPERATION when
+			// trying to glClear() for the first time.
+			[glContext setView:glView];
 
 			m_view    = glView;
 			m_context = glContext;

src/renderer_mtl.mm

@@ -3019,30 +3019,24 @@ namespace bgfx { namespace mtl
 				}
 				else
 				{
-					if (![nvh isKindOfClass:[NSView class]] &&
-					    ![nvh isKindOfClass:[NSWindow class]])
+					NSView *contentView;
+
+					if ([nvh isKindOfClass:[NSView class]])
+					{
+						contentView = (NSView*)nvh;
+					}
+					else if ([nvh isKindOfClass:[NSWindow class]])
+					{
+						NSWindow* nsWindow = (NSWindow*)nvh;
+						contentView = [nsWindow contentView];
+					}
+					else
 					{
 						BX_WARN(0, "Unable to create Metal device. Please set platform data window to an NSWindow, NSView, or CAMetalLayer");
 						return;
 					}
 
 					void (^setLayer)(void) = ^{
-						NSView *contentView;
-
-						if ([nvh isKindOfClass:[NSView class]])
-						{
-							contentView = (NSView*)nvh;
-						}
-						else if ([nvh isKindOfClass:[NSWindow class]])
-						{
-							NSWindow* nsWindow = (NSWindow*)nvh;
-							contentView = [nsWindow contentView];
-						}
-						else
-						{
-							BX_CHECK(0, "Should never have gotten here.");
-						}
-
 						CALayer* layer = contentView.layer;
 						if(NULL != layer && [layer isKindOfClass:NSClassFromString(@"CAMetalLayer")])
 						{