diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-10-04 10:51:30 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-10-04 10:52:37 -0700 |
| commit | 2f07279ccaf5aecc45ed9a78d337e73ab58d89a7 (patch) | |
| tree | d90b74f4ec320a3bc53a889eb5ba41d18b00ab52 /indra/llrender | |
| parent | 16e4747dcd04c78b438570ee6dea4ccc52e7485c (diff) | |
| parent | 4339ad9a528c82946ce40ec2bd240b41d104f338 (diff) | |
Merge remote-tracking branch 'origin/develop' into leviathan/game-control
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llgl.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index a9627a87d3..b4fe711859 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -1140,7 +1140,11 @@ bool LLGLManager::initGL() // Trailing space necessary to keep "nVidia Corpor_ati_on" cards // from being recognized as ATI. // NOTE: AMD has been pretty good about not breaking this check, do not rename without good reason - if (mGLVendor.substr(0,4) == "ATI ") + if (mGLVendor.substr(0,4) == "ATI " +#if LL_LINUX + || mGLVendor.find("AMD") != std::string::npos +#endif //LL_LINUX + ) { mGLVendorShort = "AMD"; // *TODO: Fix this? |