diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-07-23 07:13:59 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-07-23 07:14:35 (GMT) |
| commit | 64c807ed9d7e7eea95e35a26c31679dfaae820bb (patch) | |
| tree | bf7639483a1d85e1e5c097097738f462b1d9a52b /src/opengl | |
| parent | f9103011abc672059cda53078e84d9e73e687e12 (diff) | |
| parent | 5234d083c9b00ed508dae7cc8c47d21da46325c6 (diff) | |
| download | Qt-64c807ed9d7e7eea95e35a26c31679dfaae820bb.zip Qt-64c807ed9d7e7eea95e35a26c31679dfaae820bb.tar.gz Qt-64c807ed9d7e7eea95e35a26c31679dfaae820bb.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl_x11.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index d8af4d5..43bdec7 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -82,6 +82,25 @@ extern const QX11Info *qt_x11Info(const QPaintDevice *pd); #define GLX_SAMPLES_ARB 100001 #endif +#ifndef GLX_EXT_texture_from_pixmap +#define GLX_TEXTURE_2D_BIT_EXT 0x00000002 +#define GLX_TEXTURE_RECTANGLE_BIT_EXT 0x00000004 +#define GLX_BIND_TO_TEXTURE_RGB_EXT 0x20D0 +#define GLX_BIND_TO_TEXTURE_RGBA_EXT 0x20D1 +#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT 0x20D2 +#define GLX_BIND_TO_TEXTURE_TARGETS_EXT 0x20D3 +#define GLX_Y_INVERTED_EXT 0x20D4 +#define GLX_TEXTURE_FORMAT_EXT 0x20D5 +#define GLX_TEXTURE_TARGET_EXT 0x20D6 +#define GLX_MIPMAP_TEXTURE_EXT 0x20D7 +#define GLX_TEXTURE_FORMAT_NONE_EXT 0x20D8 +#define GLX_TEXTURE_FORMAT_RGB_EXT 0x20D9 +#define GLX_TEXTURE_FORMAT_RGBA_EXT 0x20DA +#define GLX_TEXTURE_2D_EXT 0x20DC +#define GLX_TEXTURE_RECTANGLE_EXT 0x20DD +#define GLX_FRONT_LEFT_EXT 0x20DE +#endif + /* The qt_gl_choose_cmap function is internal and used by QGLWidget::setContext() and GLX (not Windows). If the application can't find any sharable |