From 4c006e76e39a8b59dc6f9c890e5a27d38b5ece50 Mon Sep 17 00:00:00 2001 From: ruslantproductengine Date: Mon, 30 Sep 2019 21:01:22 +0300 Subject: SL-8191 RenderUseVAO with Basic Shaders turned off caused textures not to show - Disable VAO for fixed pipeline + UI --- indra/newview/llfloatersettingsdebug.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'indra/newview/llfloatersettingsdebug.cpp') diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp index fb202b4c40..73269d0531 100644 --- a/indra/newview/llfloatersettingsdebug.cpp +++ b/indra/newview/llfloatersettingsdebug.cpp @@ -34,6 +34,7 @@ #include "llcolorswatch.h" #include "llviewercontrol.h" #include "lltexteditor.h" +#include "llviewershadermgr.h" LLFloaterSettingsDebug::LLFloaterSettingsDebug(const LLSD& key) @@ -207,6 +208,11 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp) getChildView("val_text")->setVisible( FALSE); mComment->setText(LLStringUtil::null); + getChild("boolean_combo")->setEnabled(true); + getChild("TRUE")->setEnabled(true); + getChild("FALSE")->setEnabled(true); + getChild("default_btn")->setEnabled(true); + if (controlp) { eControlType type = controlp->type(); @@ -288,6 +294,19 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp) { getChild("boolean_combo")->setValue(LLSD("")); } + + bool bUseVAO = controlp->getName() == "RenderUseVAO"; + if (bUseVAO) + { + bool use_shaders = LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_OBJECT) > 0; + getChild("boolean_combo")->setEnabled(use_shaders); + getChild("TRUE")->setEnabled(use_shaders); + getChild("FALSE")->setEnabled(use_shaders); + getChild("default_btn")->setEnabled(use_shaders); + if (!use_shaders) { + getChild("boolean_combo")->setValue(LLSD(false)); + } + } } break; case TYPE_STRING: -- cgit v1.2.3