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

Work around gcc-3.3.3's problem with resolving namespaced symbols.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=673984
This commit is contained in:
Luboš Luňák 2007-06-11 14:35:09 +00:00
parent 955b989cfc
commit acf4e9ce8e
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/kwinglutils.h
View file

@ -14,16 +14,13 @@ License. See the file "COPYING" for the exact licensing terms.
#include <config-X11.h> // HAVE_OPENGL
#ifdef HAVE_OPENGL
#include <GL/gl.h>
#include <GL/glx.h>
#include <fixx11h.h>
#include <kwinglutils_funcs.h>
#include <QPixmap>
#include <QImage>
#include <QSize>
#include <kwinglutils_funcs.h>
template< class K, class V > class QHash;

11
lib/kwinglutils_funcs.h
View file

@ -19,6 +19,17 @@ License. See the file "COPYING" for the exact licensing terms.
#ifdef HAVE_OPENGL
// gcc-3.3.3 apparently cannot resolve KWin's namespaced versions properly,
// so hide possible global functions
#define glXQueryDrawable kwinhide_glXQueryDrawable
#include <GL/gl.h>
#include <GL/glx.h>
#undef glXQueryDrawable
#include <fixx11h.h>
namespace KWin
{

4
scene_opengl.cpp
View file

@ -766,8 +766,8 @@ void SceneOpenGL::Texture::discard()
void SceneOpenGL::Texture::findTarget()
{
unsigned int new_target = 0;
if( tfp_mode && KWin::glXQueryDrawable && bound_glxpixmap != None )
KWin::glXQueryDrawable( display(), bound_glxpixmap, GLX_TEXTURE_TARGET_EXT, &new_target );
if( tfp_mode && glXQueryDrawable && bound_glxpixmap != None )
glXQueryDrawable( display(), bound_glxpixmap, GLX_TEXTURE_TARGET_EXT, &new_target );
else
{
if( NPOTTextureSupported() ||