diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2022-06-24 15:22:27 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-06-24 15:22:27 +0000 |
| commit | 14cba35bbce3f2103d34e02eb312981cb4789a0c (patch) | |
| tree | bc4c162304eb7498cbd15664146142c4ce3131de /indra/llrender/llgl.cpp | |
| parent | a68b6087deb68a824c2b9e8ccb1111c6c8b70045 (diff) | |
| parent | a6774ca4dd3469fe1c98a53a59153c6e2db76940 (diff) | |
Merged in brad/unbreak-mac-build (pull request #1034)
Unbreak DRTVWR-559 mac build
Diffstat (limited to 'indra/llrender/llgl.cpp')
| -rw-r--r-- | indra/llrender/llgl.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 1a9203ef02..7b1ed62dc9 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -455,6 +455,7 @@ LLGLManager::LLGLManager() : mHasAnisotropic(FALSE), mHasARBEnvCombine(FALSE), mHasCubeMap(FALSE), + mHasCubeMapArray(FALSE), mHasDebugOutput(FALSE), mIsAMD(FALSE), @@ -1069,6 +1070,7 @@ void LLGLManager::initExtensions() mHasDebugOutput = ExtensionExists("GL_ARB_debug_output", gGLHExts.mSysExts); mHasTransformFeedback = mGLVersion >= 4.f ? TRUE : FALSE; mHasUniformBufferObject = ExtensionExists("GL_ARB_uniform_buffer_object", gGLHExts.mSysExts); + mHasCubeMapArray = ExtensionExists("GL_ARB_texture_cube_map_array", gGLHExts.mSysExts); #if !LL_DARWIN mHasPointParameters = ExtensionExists("GL_ARB_point_parameters", gGLHExts.mSysExts); #endif @@ -1181,6 +1183,10 @@ void LLGLManager::initExtensions() { LL_INFOS("RenderInit") << "Couldn't initialize GL_ARB_draw_buffers" << LL_ENDL; } + if (!mHasCubeMapArray) + { + LL_INFOS("RenderInit") << "Couldn't initialize GL_ARB_texture_cube_map_array" << LL_ENDL; + } // Disable certain things due to known bugs if (mIsIntel && mHasMipMapGeneration) |