Bug 1267879 - Only check robustness if it's supported. - r=jrmuizel

MozReview-Commit-ID: 4RNjnWFccID
This commit is contained in:
Jeff Gilbert 2016-06-10 17:44:49 -07:00
parent c3f1f735b3
commit 05bf436edd

View File

@ -1091,15 +1091,16 @@ GLContext::LoadMoreSymbols(const char* prefix, bool trygl)
return fnLoadForFeature(list, feature); return fnLoadForFeature(list, feature);
}; };
bool hasRobustness = false; if (IsSupported(GLFeature::robustness)) {
if (SupportsRobustness()) { bool hasRobustness = true;
if (IsExtensionSupported(ARB_robustness)) { if (IsExtensionSupported(ARB_robustness)) {
const SymLoadStruct symbols[] = { const SymLoadStruct symbols[] = {
{ (PRFuncPtr*) &mSymbols.fGetGraphicsResetStatus, { "GetGraphicsResetStatusARB", nullptr } }, { (PRFuncPtr*) &mSymbols.fGetGraphicsResetStatus, { "GetGraphicsResetStatusARB", nullptr } },
END_SYMBOLS END_SYMBOLS
}; };
if (fnLoadForExt(symbols, ARB_robustness)) { if (!fnLoadForExt(symbols, ARB_robustness)) {
hasRobustness = true; hasRobustness = false;
} }
} }
@ -1108,13 +1109,14 @@ GLContext::LoadMoreSymbols(const char* prefix, bool trygl)
{ (PRFuncPtr*) &mSymbols.fGetGraphicsResetStatus, { "GetGraphicsResetStatusEXT", nullptr } }, { (PRFuncPtr*) &mSymbols.fGetGraphicsResetStatus, { "GetGraphicsResetStatusEXT", nullptr } },
END_SYMBOLS END_SYMBOLS
}; };
if (fnLoadForExt(symbols, EXT_robustness)) { if (!fnLoadForExt(symbols, EXT_robustness)) {
hasRobustness = true; hasRobustness = false;
} }
} }
}
if (!hasRobustness) { if (!hasRobustness) {
MarkUnsupported(GLFeature::robustness); MarkUnsupported(GLFeature::robustness);
}
} }
if (IsSupported(GLFeature::sync)) { if (IsSupported(GLFeature::sync)) {