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

Fix linker errors in scene

Browse source
This commit is contained in:
Martin Gräßlin 2010-11-20 13:54:38 +01:00
parent 14522ebecb
commit b8d068088b
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scene_opengl.cpp
View file

@ -186,8 +186,12 @@ SceneOpenGL::SceneOpenGL( Workspace* ws )
debug = qstrcmp( qgetenv( "KWIN_GL_DEBUG" ), "1" ) == 0; debug = qstrcmp( qgetenv( "KWIN_GL_DEBUG" ), "1" ) == 0;
// scene shader setup // scene shader setup
#ifdef KWIN_HAVE_OPENGLES
if( true )
#else
GLPlatform::instance()->detect(); GLPlatform::instance()->detect();
if( GLPlatform::instance()->supports( GLSL ) ) if( GLPlatform::instance()->supports( GLSL ) )
#endif
{ {
m_sceneShader = new GLShader( ":/resources/scene-vertex.glsl", ":/resources/scene-fragment.glsl" ); m_sceneShader = new GLShader( ":/resources/scene-vertex.glsl", ":/resources/scene-fragment.glsl" );
if( m_sceneShader->isValid() ) if( m_sceneShader->isValid() )
@ -1131,9 +1135,9 @@ void SceneOpenGL::Texture::discard()
} }
// TODO: write for EGL // TODO: write for EGL
#ifndef KWIN_HAVE_OPENGLES
void SceneOpenGL::Texture::release() void SceneOpenGL::Texture::release()
{ {
#ifndef KWIN_HAVE_OPENGLES
if( tfp_mode && glxpixmap != None ) if( tfp_mode && glxpixmap != None )
{ {
if ( !options->glStrictBinding ) if ( !options->glStrictBinding )
@ -1141,8 +1145,8 @@ void SceneOpenGL::Texture::release()
glXDestroyPixmap( display(), glxpixmap ); glXDestroyPixmap( display(), glxpixmap );
glxpixmap = None; glxpixmap = None;
} }
}
#endif #endif
}
// TODO: write for EGL // TODO: write for EGL
#ifndef KWIN_HAVE_OPENGLES #ifndef KWIN_HAVE_OPENGLES
@ -1198,7 +1202,13 @@ QRegion SceneOpenGL::Texture::optimizeBindDamage( const QRegion& reg, int limit
} }
// TODO: write EGL variant // TODO: write EGL variant
#ifndef KWIN_HAVE_OPENGLES #ifdef KWIN_HAVE_OPENGLES
bool SceneOpenGL::Texture::load( const Pixmap& pix, const QSize& size,
int depth, QRegion region )
{
return false;
}
#else
bool SceneOpenGL::Texture::load( const Pixmap& pix, const QSize& size, bool SceneOpenGL::Texture::load( const Pixmap& pix, const QSize& size,
int depth, QRegion region ) int depth, QRegion region )
{ {