Work around gcc-3.3.3's problem with resolving namespaced symbols.
svn path=/trunk/KDE/kdebase/workspace/; revision=673984icc-effect-5.14.5
parent
955b989cfc
commit
acf4e9ce8e
|
@ -14,16 +14,13 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include <config-X11.h> // HAVE_OPENGL
|
#include <config-X11.h> // HAVE_OPENGL
|
||||||
|
|
||||||
#ifdef HAVE_OPENGL
|
#ifdef HAVE_OPENGL
|
||||||
#include <GL/gl.h>
|
#include <kwinglutils_funcs.h>
|
||||||
#include <GL/glx.h>
|
|
||||||
#include <fixx11h.h>
|
|
||||||
|
|
||||||
#include <QPixmap>
|
#include <QPixmap>
|
||||||
|
|
||||||
#include <QImage>
|
#include <QImage>
|
||||||
#include <QSize>
|
#include <QSize>
|
||||||
|
|
||||||
#include <kwinglutils_funcs.h>
|
|
||||||
|
|
||||||
|
|
||||||
template< class K, class V > class QHash;
|
template< class K, class V > class QHash;
|
||||||
|
|
|
@ -19,6 +19,17 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
|
|
||||||
#ifdef HAVE_OPENGL
|
#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
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
@ -766,8 +766,8 @@ void SceneOpenGL::Texture::discard()
|
||||||
void SceneOpenGL::Texture::findTarget()
|
void SceneOpenGL::Texture::findTarget()
|
||||||
{
|
{
|
||||||
unsigned int new_target = 0;
|
unsigned int new_target = 0;
|
||||||
if( tfp_mode && KWin::glXQueryDrawable && bound_glxpixmap != None )
|
if( tfp_mode && glXQueryDrawable && bound_glxpixmap != None )
|
||||||
KWin::glXQueryDrawable( display(), bound_glxpixmap, GLX_TEXTURE_TARGET_EXT, &new_target );
|
glXQueryDrawable( display(), bound_glxpixmap, GLX_TEXTURE_TARGET_EXT, &new_target );
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if( NPOTTextureSupported() ||
|
if( NPOTTextureSupported() ||
|
||||||
|
|
Loading…
Reference in New Issue