diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-08-28 12:07:20 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-08-28 12:07:20 (GMT) |
| commit | 7c2620578ba0698a14c1d4ff5c7a4e260f06ad31 (patch) | |
| tree | edb83c85af4bdc12a8230834a10f8e90b4b9ee2e /src/opengl/qgl.h | |
| parent | 0ba973c885257941800e895aacc387904d1737ef (diff) | |
| download | Qt-7c2620578ba0698a14c1d4ff5c7a4e260f06ad31.zip Qt-7c2620578ba0698a14c1d4ff5c7a4e260f06ad31.tar.gz Qt-7c2620578ba0698a14c1d4ff5c7a4e260f06ad31.tar.bz2 | |
Attempting to make EGL compile again and fix some potential
issues with flipped pixmaps on X11
Diffstat (limited to 'src/opengl/qgl.h')
| -rw-r--r-- | src/opengl/qgl.h | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index 13ad668..96a8b08 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -289,16 +289,20 @@ public: virtual void swapBuffers() const; enum BindOption { - NoBindOption = 0x0000, - InvertedYBindOption = 0x0001, - MipmapBindOption = 0x0002, - PremultipliedAlphaBindOption = 0x0004, - LinearFilteringBindOption = 0x0008, - - MemoryManagedBindOption = 0x1000, // internal flag - - DefaultBindOption = LinearFilteringBindOption | InvertedYBindOption | MipmapBindOption, - InternalBindOption = MemoryManagedBindOption | PremultipliedAlphaBindOption + NoBindOption = 0x0000, + InvertedYBindOption = 0x0001, + MipmapBindOption = 0x0002, + PremultipliedAlphaBindOption = 0x0004, + LinearFilteringBindOption = 0x0008, + + MemoryManagedBindOption = 0x0010, // internal flag + CanFlipNativePixmapBindOption = 0x0020, // internal flag + + DefaultBindOption = LinearFilteringBindOption + | InvertedYBindOption + | MipmapBindOption, + InternalBindOption = MemoryManagedBindOption + | PremultipliedAlphaBindOption }; Q_DECLARE_FLAGS(BindOptions, BindOption) @@ -407,6 +411,7 @@ private: Q_DISABLE_COPY(QGLContext) }; +Q_DECLARE_OPERATORS_FOR_FLAGS(QGLContext::BindOptions); class Q_OPENGL_EXPORT QGLWidget : public QWidget { |