FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Error-reporting: improve reports for STGs and effects

Browse Source 
When an effect defines no shader sources, special case this error to
avoid confusing result from SGProgram.

Add error-context for readNode STG loading, so failures inside an
STG can be attributed
This commit is contained in:
James Turner 2021-04-30 13:47:27 +01:00 committed by Automatic Release Builder
parent ed29d9b75d
commit 01233ba537
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
simgear/scene/material/Effect.cxx
View File

@ -993,6 +993,14 @@ void ShaderProgramBuilder::buildAttribute(Effect* effect, Pass* pass,
} }
} }
} }
if (sgprogram->getNumShaders() == 0) {
simgear::reportFailure(simgear::LoadFailure::BadData,
simgear::ErrorCode::LoadEffectsShaders,
"No shader source code defined for effect",
effect->filePath());
}
for (const auto& key : prgKey.attributes) { for (const auto& key : prgKey.attributes) {
program->addBindAttribLocation(key.first, key.second); program->addBindAttribLocation(key.first, key.second);
} }

7
simgear/scene/tgdb/ReaderWriterSTG.cxx
View File

@ -580,7 +580,9 @@ struct ReaderWriterSTG::_ModelBin {
} }
callback(token,name, SGGeod::fromDegM(obj._lon, obj._lat, obj._elev), obj._hdg,restofline); callback(token,name, SGGeod::fromDegM(obj._lon, obj._lat, obj._elev), obj._hdg,restofline);
} else { } else {
SG_LOG( SG_TERRAIN, SG_ALERT, absoluteFileName << ": Unknown token '" << token << "'" ); // SG_LOG( SG_TERRAIN, SG_ALERT, absoluteFileName << ": Unknown token '" << token << "'" );
simgear::reportFailure(simgear::LoadFailure::Misconfigured, simgear::ErrorCode::BTGLoad,
"Unknown STG token:" + token, absoluteFileName);
} }
} }
} }
@ -709,6 +711,7 @@ ReaderWriterSTG::readNode(const std::string& fileName, const osgDB::Options* opt
{ {
_ModelBin modelBin; _ModelBin modelBin;
SGBucket bucket(bucketIndexFromFileName(fileName)); SGBucket bucket(bucketIndexFromFileName(fileName));
simgear::ErrorReportContext ec("terrain-bucket", bucket.gen_index_str());
// We treat 123.stg different than ./123.stg. // We treat 123.stg different than ./123.stg.
// The difference is that ./123.stg as well as any absolute path // The difference is that ./123.stg as well as any absolute path
@ -716,6 +719,7 @@ ReaderWriterSTG::readNode(const std::string& fileName, const osgDB::Options* opt
// In contrast 123.stg uses the search paths to load a set of stg // In contrast 123.stg uses the search paths to load a set of stg
// files spread across the scenery directories. // files spread across the scenery directories.
if (osgDB::getSimpleFileName(fileName) != fileName) { if (osgDB::getSimpleFileName(fileName) != fileName) {
simgear::ErrorReportContext ec("terrain-stg", fileName);
if (!modelBin.read(fileName, options)) if (!modelBin.read(fileName, options))
return ReadResult::FILE_NOT_FOUND; return ReadResult::FILE_NOT_FOUND;
} }
@ -754,6 +758,7 @@ ReaderWriterSTG::readNode(const std::string& fileName, const osgDB::Options* opt
for (auto suffix : sgOpts->getSceneryPathSuffixes()) { for (auto suffix : sgOpts->getSceneryPathSuffixes()) {
const auto p = base / suffix / basePath / fileName; const auto p = base / suffix / basePath / fileName;
simgear::ErrorReportContext ec("terrain-stg", p.utf8Str());
modelBin.read(p, options); modelBin.read(p, options);
} }
} }

21
simgear/scene/util/SGProgram.cxx
View File

@ -52,19 +52,20 @@ void SGProgram::apply(osg::State& state) const
std::string infoLog; std::string infoLog;
_checkState = FailedToApply; _checkState = FailedToApply;
getPCP(state)->getInfoLog(infoLog); getPCP(state)->getInfoLog(infoLog);
if (!infoLog.empty()) {
// log all the shader source file names, to help in debugging link errors
std::ostringstream os;
for (int i = 0; i < getNumShaders(); ++i) {
const auto shader = getShader(i);
os << "\t" << shader->getFileName() << "\n";
}
// log all the shader source file names, to help in debugging link errors simgear::reportFailure(simgear::LoadFailure::BadData, simgear::ErrorCode::LoadEffectsShaders,
std::ostringstream os; "Shader program errors: " + infoLog +
for (int i = 0; i < getNumShaders(); ++i) { "\n\nShader sources:\n" + os.str(),
const auto shader = getShader(i); _effectFilePath);
os << "\t" << shader->getFileName() << "\n";
} }
simgear::reportFailure(simgear::LoadFailure::BadData, simgear::ErrorCode::LoadEffectsShaders,
"Shader program errors: " + infoLog +
"\n\nShader sources:\n" + os.str(),
_effectFilePath);
for (int i = 0; i < getNumShaders(); ++i) { for (int i = 0; i < getNumShaders(); ++i) {
const auto shader = getShader(i); const auto shader = getShader(i);
auto pcs = shader->getPCS(state); auto pcs = shader->getPCS(state);