diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-11-06 17:34:13 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-11-06 17:34:13 +0800 |
| commit | cd8470549bb2550acedca9bb78cb9b4580059170 (patch) | |
| tree | 3fb65732c810be733534674b692c5eecf0c9e5ed /indra/llwindow | |
| parent | ce43d94c9de73eda527f2f4bd50fe3e144beaee2 (diff) | |
| parent | 89e4e6993f3cb11dd2206795c30834594880f52f (diff) | |
Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index b99af1ae4c..778e5d3898 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -1962,10 +1962,12 @@ public: 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; } |