diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-16 12:53:04 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-08-16 15:44:26 +0200 |
| commit | 0d5170256c1658b0f6e0d3f6c736de01655b29d8 (patch) | |
| tree | 79f6252ffbda9eeb1ce54fc9987618fdc7e58be2 /src/opengl/qglframebufferobject.h | |
| parent | 06f6b71ba43e8302d61d2c3cb7118d9dbf7a3c98 (diff) | |
Get rid of OpenGL 1.x engine and platform code from QtOpenGL.
Change-Id: I646b8e26d5e7214432a044866764d57cc11b2390
Reviewed-on: http://codereview.qt.nokia.com/3006
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'src/opengl/qglframebufferobject.h')
| -rw-r--r-- | src/opengl/qglframebufferobject.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/opengl/qglframebufferobject.h b/src/opengl/qglframebufferobject.h index d5e5c482fb..817aecd9b7 100644 --- a/src/opengl/qglframebufferobject.h +++ b/src/opengl/qglframebufferobject.h @@ -81,16 +81,6 @@ public: QGLFramebufferObject(const QSize &size, const QGLFramebufferObjectFormat &format); QGLFramebufferObject(int width, int height, const QGLFramebufferObjectFormat &format); -#ifdef Q_MAC_COMPAT_GL_FUNCTIONS - QGLFramebufferObject(const QSize &size, QMacCompatGLenum target = GL_TEXTURE_2D); - QGLFramebufferObject(int width, int height, QMacCompatGLenum target = GL_TEXTURE_2D); - - QGLFramebufferObject(const QSize &size, Attachment attachment, - QMacCompatGLenum target = GL_TEXTURE_2D, QMacCompatGLenum internal_format = GL_RGBA8); - QGLFramebufferObject(int width, int height, Attachment attachment, - QMacCompatGLenum target = GL_TEXTURE_2D, QMacCompatGLenum internal_format = GL_RGBA8); -#endif - virtual ~QGLFramebufferObject(); QGLFramebufferObjectFormat format() const; @@ -114,10 +104,6 @@ public: void drawTexture(const QRectF &target, GLuint textureId, GLenum textureTarget = GL_TEXTURE_2D); void drawTexture(const QPointF &point, GLuint textureId, GLenum textureTarget = GL_TEXTURE_2D); -#ifdef Q_MAC_COMPAT_GL_FUNCTIONS - void drawTexture(const QRectF &target, QMacCompatGLuint textureId, QMacCompatGLenum textureTarget = GL_TEXTURE_2D); - void drawTexture(const QPointF &point, QMacCompatGLuint textureId, QMacCompatGLenum textureTarget = GL_TEXTURE_2D); -#endif static bool hasOpenGLFramebufferBlit(); static void blitFramebuffer(QGLFramebufferObject *target, const QRect &targetRect, @@ -160,11 +146,6 @@ public: void setInternalTextureFormat(GLenum internalTextureFormat); GLenum internalTextureFormat() const; -#ifdef Q_MAC_COMPAT_GL_FUNCTIONS - void setTextureTarget(QMacCompatGLenum target); - void setInternalTextureFormat(QMacCompatGLenum internalTextureFormat); -#endif - bool operator==(const QGLFramebufferObjectFormat& other) const; bool operator!=(const QGLFramebufferObjectFormat& other) const; |