yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove some more unsupported functions

Browse source
This commit is contained in:
Martin Gräßlin 2010-11-20 10:27:06 +01:00
parent fd8dfa2084
commit 2cf5f79880
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/kwinglutils.cpp
View file

@ -57,6 +57,7 @@ int glTextureUnitsCount;
// Functions // Functions
void initGLX() void initGLX()
{ {
#ifndef KWIN_HAVE_OPENGLES
// Get GLX version // Get GLX version
int major, minor; int major, minor;
glXQueryVersion( display(), &major, &minor ); glXQueryVersion( display(), &major, &minor );
@ -66,6 +67,7 @@ void initGLX()
display(), DefaultScreen( display()))).split(' '); display(), DefaultScreen( display()))).split(' ');
glxResolveFunctions(); glxResolveFunctions();
#endif
} }
void initGL() void initGL()
@ -79,7 +81,9 @@ void initGL()
glExtensions = QString((const char*)glGetString(GL_EXTENSIONS)).split(' '); glExtensions = QString((const char*)glGetString(GL_EXTENSIONS)).split(' ');
// handle OpenGL extensions functions // handle OpenGL extensions functions
#ifndef KWIN_HAVE_OPENGLES
glResolveFunctions(); glResolveFunctions();
#endif
GLTexture::initStatic(); GLTexture::initStatic();
GLShader::initStatic(); GLShader::initStatic();
@ -110,8 +114,10 @@ static QString formatGLError( GLenum err )
case GL_INVALID_ENUM: return "GL_INVALID_ENUM"; case GL_INVALID_ENUM: return "GL_INVALID_ENUM";
case GL_INVALID_VALUE: return "GL_INVALID_VALUE"; case GL_INVALID_VALUE: return "GL_INVALID_VALUE";
case GL_INVALID_OPERATION: return "GL_INVALID_OPERATION"; case GL_INVALID_OPERATION: return "GL_INVALID_OPERATION";
#ifndef KWIN_HAVE_OPENGLES
case GL_STACK_OVERFLOW: return "GL_STACK_OVERFLOW"; case GL_STACK_OVERFLOW: return "GL_STACK_OVERFLOW";
case GL_STACK_UNDERFLOW: return "GL_STACK_UNDERFLOW"; case GL_STACK_UNDERFLOW: return "GL_STACK_UNDERFLOW";
#endif
case GL_OUT_OF_MEMORY: return "GL_OUT_OF_MEMORY"; case GL_OUT_OF_MEMORY: return "GL_OUT_OF_MEMORY";
default: return QString( "0x" ) + QString::number( err, 16 ); default: return QString( "0x" ) + QString::number( err, 16 );
} }