diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-01-24 10:39:43 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-29 21:58:17 +0100 |
| commit | 962edab745ff810290110d20c56b959075833dfe (patch) | |
| tree | 30ee3561bba6fc6d0079a839baf4535745bb3ebe /src/opengl | |
| parent | 3eb588078e7f4d62053584a70f7600b19ec99a0f (diff) | |
Drop the unused QGLContextPrivate::convertToGLFormat function
Change-Id: Iaa176fc6152162c91a3e3bd373a235883001975c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl.cpp | 12 | ||||
| -rw-r--r-- | src/opengl/qgl_p.h | 1 |
2 files changed, 0 insertions, 13 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 3cb738b9c8..173f570256 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -2139,18 +2139,6 @@ QGLExtensionFuncs& QGLContextPrivate::extensionFuncs(const QGLContext *) return qt_extensionFuncs; } -QImage QGLContextPrivate::convertToGLFormat(const QImage &image, bool force_premul, - GLenum texture_format) -{ - QImage::Format target_format = image.format(); - if (force_premul || image.format() != QImage::Format_ARGB32) - target_format = QImage::Format_ARGB32_Premultiplied; - - QImage result(image.width(), image.height(), target_format); - convertToGLFormatHelper(result, image.convertToFormat(target_format), texture_format); - return result; -} - /*! \internal */ QGLTexture *QGLContextPrivate::bindTexture(const QImage &image, GLenum target, GLint format, QGLContext::BindOptions options) diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 5fd870beee..0791fe5110 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -265,7 +265,6 @@ public: QGLContext::BindOptions options); QGLTexture *textureCacheLookup(const qint64 key, GLenum target); void init(QPaintDevice *dev, const QGLFormat &format); - QImage convertToGLFormat(const QImage &image, bool force_premul, GLenum texture_format); int maxTextureSize(); void cleanup(); |