Browse Source

Remove unused Context::{major,minor}Version() functions.

Superseeded by Context::version() and various utilities around Version
enum.
pull/107/head
Vladimír Vondruš 11 years ago
parent
commit
96d99ac4f8
  1. 26
      src/Magnum/Context.cpp
  2. 18
      src/Magnum/Context.h

26
src/Magnum/Context.cpp

@ -360,13 +360,15 @@ Context::Context(void functionLoader()) {
/* Load GL function pointers */ /* Load GL function pointers */
if(functionLoader) functionLoader(); if(functionLoader) functionLoader();
GLint majorVersion, minorVersion;
/* Get version on ES 3.0+/WebGL 2.0+ */ /* Get version on ES 3.0+/WebGL 2.0+ */
#if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_GLES2) #if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_GLES2)
/* ES 3.0+ */ /* ES 3.0+ */
#ifndef MAGNUM_TARGET_WEBGL #ifndef MAGNUM_TARGET_WEBGL
glGetIntegerv(GL_MAJOR_VERSION, &_majorVersion); glGetIntegerv(GL_MAJOR_VERSION, &majorVersion);
glGetIntegerv(GL_MINOR_VERSION, &_minorVersion); glGetIntegerv(GL_MINOR_VERSION, &minorVersion);
/* WebGL 2.0, treat it as ES 3.0 */ /* WebGL 2.0, treat it as ES 3.0 */
#else #else
@ -375,8 +377,8 @@ Context::Context(void functionLoader()) {
Error() << "Context: unsupported version string:" << version; Error() << "Context: unsupported version string:" << version;
std::exit(65); std::exit(65);
} }
_majorVersion = 3; majorVersion = 3;
_minorVersion = 0; minorVersion = 0;
#endif #endif
/* On GL 2.1 and ES 2.0 there is no GL_{MAJOR,MINOR}_VERSION, we have to /* On GL 2.1 and ES 2.0 there is no GL_{MAJOR,MINOR}_VERSION, we have to
@ -385,10 +387,10 @@ Context::Context(void functionLoader()) {
enum error. */ enum error. */
#else #else
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
glGetIntegerv(GL_MAJOR_VERSION, &_majorVersion); glGetIntegerv(GL_MAJOR_VERSION, &majorVersion);
const auto versionNumberError = Renderer::error(); const auto versionNumberError = Renderer::error();
if(versionNumberError == Renderer::Error::NoError) if(versionNumberError == Renderer::Error::NoError)
glGetIntegerv(GL_MINOR_VERSION, &_minorVersion); glGetIntegerv(GL_MINOR_VERSION, &minorVersion);
else else
#endif #endif
{ {
@ -408,11 +410,11 @@ Context::Context(void functionLoader()) {
version.find("OpenGL ES 3.") != std::string::npos) version.find("OpenGL ES 3.") != std::string::npos)
#endif #endif
{ {
_majorVersion = 2; majorVersion = 2;
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
_minorVersion = 1; minorVersion = 1;
#else #else
_minorVersion = 0; minorVersion = 0;
#endif #endif
} else { } else {
Error() << "Context: unsupported version string:" << version; Error() << "Context: unsupported version string:" << version;
@ -422,7 +424,7 @@ Context::Context(void functionLoader()) {
#endif #endif
/* Compose the version enum */ /* Compose the version enum */
_version = Magnum::version(_majorVersion, _minorVersion); _version = Magnum::version(majorVersion, minorVersion);
/* Check that version retrieval went right */ /* Check that version retrieval went right */
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
@ -441,9 +443,9 @@ Context::Context(void functionLoader()) {
#endif #endif
{ {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
Error() << "Context: unsupported OpenGL version" << Magnum::version(_version); Error() << "Context: unsupported OpenGL version" << std::make_pair(majorVersion, minorVersion);
#else #else
Error() << "Context: unsupported OpenGL ES version" << Magnum::version(_version); Error() << "Context: unsupported OpenGL ES version" << std::make_pair(majorVersion, minorVersion);
#endif #endif
std::exit(66); std::exit(66);
} }

18
src/Magnum/Context.h

@ -240,22 +240,6 @@ class MAGNUM_EXPORT Context {
*/ */
Version version() const { return _version; } Version version() const { return _version; }
/**
* @brief Major OpenGL version (e.g. `4`)
*
* @see @ref minorVersion(), @ref version(), @ref versionString(),
* @ref shadingLanguageVersionString()
*/
Int majorVersion() const { return _majorVersion; }
/**
* @brief Minor OpenGL version (e.g. `3`)
*
* @see @ref majorVersion(), @ref version(), @ref versionString(),
* @ref shadingLanguageVersionString()
*/
Int minorVersion() const { return _minorVersion; }
/** /**
* @brief Vendor string * @brief Vendor string
* *
@ -490,8 +474,6 @@ class MAGNUM_EXPORT Context {
MAGNUM_LOCAL void setupDriverWorkarounds(); MAGNUM_LOCAL void setupDriverWorkarounds();
Version _version; Version _version;
Int _majorVersion;
Int _minorVersion;
#ifndef MAGNUM_TARGET_WEBGL #ifndef MAGNUM_TARGET_WEBGL
Flags _flags; Flags _flags;
#endif #endif

Loading…
Cancel
Save