From 70721bae390ab49ff24022c5c8f75bc274adc8c8 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 3 Nov 2023 11:15:19 -0500
Subject: [PATCH] DRTVWR-559 Fix for mac build.
---
indra/llwindow/llwindowmacosx.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index b99af1ae4c0..778e5d38981 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -1962,10 +1962,12 @@ class sharedContext
void* LLWindowMacOSX::createSharedContext()
{
sharedContext* sc = new sharedContext();
- CGLError err = CGLCreateContext(mPixelFormat, mContext, &(sc->mContext));
- llassert(err == kCGLNoError);
-
- CGLEnable(mContext, kCGLCEMPEngine);
+ CGLCreateContext(mPixelFormat, mContext, &(sc->mContext));
+
+ if (sUseMultGL)
+ {
+ CGLEnable(mContext, kCGLCEMPEngine);
+ }
return (void *)sc;
}
--
GitLab