From b47d2a1c0e432483d93693de58956367a3c935d6 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Thu, 7 Sep 2023 21:14:07 +0800 Subject: Bring back GL_MULTISAMPLE_ARB to macOS since it doesn't have GL_MULTISAMPLE_EXT. --- indra/llrender/llgl.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index f597b1a932..5ad8e7f5df 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -1621,8 +1621,13 @@ void LLGLState::initClass() // sStateMap[GL_TEXTURE_2D] = GL_TRUE; //make sure multisample defaults to disabled +#if GL_ARB_multisample + sStateMap[GL_MULTISAMPLE_ARB] = GL_FALSE; + glDisable(GL_MULTISAMPLE_ARB); +#else sStateMap[GL_MULTISAMPLE_EXT] = GL_FALSE; glDisable(GL_MULTISAMPLE_EXT); +#endif } //static -- cgit v1.2.3