diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-09-07 21:12:38 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-09-07 21:12:38 +0800 |
| commit | d0b773094d5a3129f5b6db7d9de0da41791b2852 (patch) | |
| tree | 39f105213ba151355bdb19f54f39a008091be463 /indra/llrender/llgl.cpp | |
| parent | 3da53b180139d2a79811c1ed7384beaad3a86a48 (diff) | |
Revert "Bring back GL funcs & macros that work on macOS"
This reverts commit e600f6504cd7edd9d2883ea7dc17c2574b1ff468.
Diffstat (limited to 'indra/llrender/llgl.cpp')
| -rw-r--r-- | indra/llrender/llgl.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 9c809d5bd0..f597b1a932 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -777,12 +777,10 @@ bool LLGLManager::initGL() if (mHasTextureMultisample) { -#if GL_VERSION_3_2 glGetIntegerv(GL_MAX_COLOR_TEXTURE_SAMPLES, &mMaxColorTextureSamples); glGetIntegerv(GL_MAX_DEPTH_TEXTURE_SAMPLES, &mMaxDepthTextureSamples); glGetIntegerv(GL_MAX_INTEGER_SAMPLES, &mMaxIntegerSamples); glGetIntegerv(GL_MAX_SAMPLE_MASK_WORDS, &mMaxSampleMaskWords); -#endif } stop_glerror(); @@ -1623,13 +1621,8 @@ 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); -#elif GL_EXT_multisample || GL_EXT_multisample_compatibility sStateMap[GL_MULTISAMPLE_EXT] = GL_FALSE; glDisable(GL_MULTISAMPLE_EXT); -#endif } //static |