wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 905161 - Remove the return type of GLContext::MarkUnsupported - r=jgilbert

Browse Source
This commit is contained in:
Guillaume Abadie 2013-08-23 19:33:42 -04:00
parent 18342a834d
commit c0847c450a
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/gl/GLContext.cpp
View File

@ -658,7 +658,7 @@ GLContext::InitWithPrefix(const char *prefix, bool trygl)
if (!LoadSymbols(instancedArraySymbols, trygl, prefix)) {
NS_ERROR("GL supports array instanced without supplying it function.");
mInitialized &= MarkUnsupported(GLFeature::instanced_arrays);
MarkUnsupported(GLFeature::instanced_arrays);
mSymbols.fVertexAttribDivisor = nullptr;
}
}
@ -767,9 +767,9 @@ GLContext::InitWithPrefix(const char *prefix, bool trygl)
if (!LoadSymbols(queryObjectsSymbols, trygl, prefix)) {
NS_ERROR("GL supports query objects without supplying its functions.");
mInitialized &= MarkUnsupported(GLFeature::query_objects);
mInitialized &= MarkUnsupported(GLFeature::get_query_object_iv);
mInitialized &= MarkUnsupported(GLFeature::occlusion_query);
MarkUnsupported(GLFeature::query_objects);
MarkUnsupported(GLFeature::get_query_object_iv);
MarkUnsupported(GLFeature::occlusion_query);
MarkUnsupported(GLFeature::occlusion_query_boolean);
MarkUnsupported(GLFeature::occlusion_query2);
mSymbols.fBeginQuery = nullptr;
@ -791,7 +791,7 @@ GLContext::InitWithPrefix(const char *prefix, bool trygl)
if (!LoadSymbols(queryObjectsSymbols, trygl, prefix)) {
NS_ERROR("GL supports query objects iv getter without supplying its function.");
mInitialized &= MarkUnsupported(GLFeature::get_query_object_iv);
MarkUnsupported(GLFeature::get_query_object_iv);
mSymbols.fGetQueryObjectiv = nullptr;
}
}

2
gfx/gl/GLContext.h
View File

@ -523,7 +523,7 @@ private:
/**
* Mark the feature and associated extensions as unsupported
*/
bool MarkUnsupported(GLFeature::Enum feature);
void MarkUnsupported(GLFeature::Enum feature);
// -----------------------------------------------------------------------------
// Robustness handling

4
gfx/gl/GLContextFeatures.cpp
View File

@ -364,7 +364,7 @@ GLContext::InitFeatures()
}
}
bool
void
GLContext::MarkUnsupported(GLFeature::Enum feature)
{
mAvailableFeatures[feature] = false;
@ -385,8 +385,6 @@ GLContext::MarkUnsupported(GLFeature::Enum feature)
MOZ_ASSERT(!IsSupported(feature), "GLContext::MarkUnsupported has failed!");
NS_WARNING(nsPrintfCString("%s marked as unsupported", GetFeatureName(feature)).get());
return true;
}
} /* namespace gl */