diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-12-15 12:34:37 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-12-15 12:34:37 +0800 |
| commit | 3316ffb3b571b8730d26d6e8b2ee00fc9cbdf7c0 (patch) | |
| tree | 200cd8497a4fdd782ac4dbfd2ad5fb1632e03275 /indra/newview/llfloaterpreferencesgraphicsadvanced.cpp | |
| parent | d4e433b37af94ee11880deeede74a87a728f4775 (diff) | |
| parent | 5b77436cf0ad749d36e8f0c60077eeb24698d644 (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/newview/llfloaterpreferencesgraphicsadvanced.cpp')
| -rw-r--r-- | indra/newview/llfloaterpreferencesgraphicsadvanced.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp b/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp index 51bb255f6e..5e53e00e0a 100644 --- a/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp +++ b/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp @@ -63,17 +63,24 @@ LLFloaterPreferenceGraphicsAdvanced::~LLFloaterPreferenceGraphicsAdvanced() bool LLFloaterPreferenceGraphicsAdvanced::postBuild() { - // Don't do this on Mac as their braindead GL versioning - // sets this when 8x and 16x are indeed available + // Disable FSAA combo when shaders are not loaded // -#if !LL_DARWIN - if (gGLManager.mIsIntel || gGLManager.mGLVersion < 3.f) - { //remove FSAA settings above "4x" + { LLComboBox* combo = getChild<LLComboBox>("fsaa"); - combo->remove("8x"); - combo->remove("16x"); + if (!gFXAAProgram[0].isComplete()) + combo->remove("FXAA"); + + if (!gSMAAEdgeDetectProgram[0].isComplete()) + combo->remove("SMAA"); + + if (!gFXAAProgram[0].isComplete() && !gSMAAEdgeDetectProgram[0].isComplete()) + { + combo->setEnabled(false); + getChild<LLComboBox>("fsaa quality")->setEnabled(false); + } } +#if !LL_DARWIN LLCheckBoxCtrl *use_HiDPI = getChild<LLCheckBoxCtrl>("use HiDPI"); use_HiDPI->setVisible(false); #endif |