livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-17584 Better logging for setShaders crashes

master
Andrey Kleshchev 2023-03-03 23:04:06 +02:00
parent a546aa20b7
commit 22018af63c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llviewershadermgr.cpp
View File

@ -35,6 +35,7 @@
#include "llrender.h"
#include "llenvironment.h"
#include "llerrorcontrol.h"
#include "llatmosphere.h"
#include "llworld.h"
#include "llsky.h"
@ -559,10 +560,15 @@ void LLViewerShaderMgr::setShaders()
std::string shader_name = loadBasicShaders();
if (shader_name.empty())
{
LL_INFOS() << "Loaded basic shaders." << LL_ENDL;
LL_INFOS("Shader") << "Loaded basic shaders." << LL_ENDL;
}
else
{
// "ShaderLoading" and "Shader" need to be logged
LLError::ELevel lvl = LLError::getDefaultLevel();
LLError::setDefaultLevel(LLError::LEVEL_DEBUG);
loadBasicShaders();
LLError::setDefaultLevel(lvl);
LL_ERRS() << "Unable to load basic shader " << shader_name << ", verify graphics driver installed and current." << LL_ENDL;
reentrance = false; // For hygiene only, re-try probably helps nothing
return;