Browse Source

Proper naming of private variable.

pull/107/head
Vladimír Vondruš 11 years ago
parent
commit
a8f04ec7a9
  1. 4
      src/Magnum/Context.cpp
  2. 6
      src/Magnum/Context.h

4
src/Magnum/Context.cpp

@ -495,7 +495,7 @@ Context::Context(void functionLoader()) {
/* Mark all extensions from past versions as supported */ /* Mark all extensions from past versions as supported */
for(std::size_t i = 0; i != future; ++i) for(std::size_t i = 0; i != future; ++i)
for(const Extension& extension: Extension::extensions(versions[i])) for(const Extension& extension: Extension::extensions(versions[i]))
extensionStatus.set(extension._index); _extensionStatus.set(extension._index);
/* List of extensions from future versions (extensions from current and /* List of extensions from future versions (extensions from current and
previous versions should be supported automatically, so we don't need previous versions should be supported automatically, so we don't need
@ -511,7 +511,7 @@ Context::Context(void functionLoader()) {
const auto found = futureExtensions.find(extension); const auto found = futureExtensions.find(extension);
if(found != futureExtensions.end()) { if(found != futureExtensions.end()) {
_supportedExtensions.push_back(found->second); _supportedExtensions.push_back(found->second);
extensionStatus.set(found->second._index); _extensionStatus.set(found->second._index);
} }
} }

6
src/Magnum/Context.h

@ -384,7 +384,7 @@ class MAGNUM_EXPORT Context {
* @endcode * @endcode
*/ */
template<class T> bool isExtensionSupported(Version version) const { template<class T> bool isExtensionSupported(Version version) const {
return _extensionRequiredVersion[T::Index] <= version && extensionStatus[T::Index]; return _extensionRequiredVersion[T::Index] <= version && _extensionStatus[T::Index];
} }
/** /**
@ -397,7 +397,7 @@ class MAGNUM_EXPORT Context {
* @ref MAGNUM_ASSERT_EXTENSION_SUPPORTED() * @ref MAGNUM_ASSERT_EXTENSION_SUPPORTED()
*/ */
bool isExtensionSupported(const Extension& extension) const { bool isExtensionSupported(const Extension& extension) const {
return isVersionSupported(_extensionRequiredVersion[extension._index]) && extensionStatus[extension._index]; return isVersionSupported(_extensionRequiredVersion[extension._index]) && _extensionStatus[extension._index];
} }
/** /**
@ -471,7 +471,7 @@ class MAGNUM_EXPORT Context {
#endif #endif
std::array<Version, 160> _extensionRequiredVersion; std::array<Version, 160> _extensionRequiredVersion;
std::bitset<160> extensionStatus; std::bitset<160> _extensionStatus;
std::vector<Extension> _supportedExtensions; std::vector<Extension> _supportedExtensions;
Implementation::State* _state; Implementation::State* _state;

Loading…
Cancel
Save