diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2014-07-21 09:30:43 +0100 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2014-07-24 21:00:20 +0200 |
| commit | 223f5c0273452b1ccd48b6f1057598f507a1b2b9 (patch) | |
| tree | 2fd7e775ac6c2757049a70c289335a1e99baaf5d /src | |
| parent | f70031c17b9724d8918420a3ab7342b62c061485 (diff) | |
Add missing 8_8_8_8 pixel types to QOpenGLTexture
Task-number: QTBUG-36843
Change-Id: Ief4ab9b00b075abe2e04c6d29c8d1279406b5033
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/opengl/qopengltexture.cpp | 2 | ||||
| -rw-r--r-- | src/gui/opengl/qopengltexture.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/opengl/qopengltexture.cpp b/src/gui/opengl/qopengltexture.cpp index 0b9732d278..811505cecb 100644 --- a/src/gui/opengl/qopengltexture.cpp +++ b/src/gui/opengl/qopengltexture.cpp @@ -1613,6 +1613,8 @@ QOpenGLTexture *QOpenGLTexturePrivate::createTextureView(QOpenGLTexture::Target \value UInt16_R5G6B5_Rev Equivalent to GL_UNSIGNED_SHORT_5_6_5_REV \value UInt16_RGBA4 Equivalent to GL_UNSIGNED_SHORT_4_4_4_4 \value UInt16_RGBA4_Rev Equivalent to GL_UNSIGNED_SHORT_4_4_4_4_REV + \value UInt32_RGBA8 Equivalent to GL_UNSIGNED_INT_8_8_8_8 + \value UInt32_RGBA8_Rev Equivalent to GL_UNSIGNED_INT_8_8_8_8_REV \value UInt32_RGB10A2 Equivalent to GL_UNSIGNED_INT_10_10_10_2 \value UInt32_RGB10A2_Rev Equivalent to GL_UNSIGNED_INT_2_10_10_10_REV \value UInt32_D24S8 Equivalent to GL_UNSIGNED_INT_24_8. Introduced in Qt 5.4 diff --git a/src/gui/opengl/qopengltexture.h b/src/gui/opengl/qopengltexture.h index ea81f1f8a4..1f4e0c048f 100644 --- a/src/gui/opengl/qopengltexture.h +++ b/src/gui/opengl/qopengltexture.h @@ -340,6 +340,8 @@ public: UInt16_R5G6B5_Rev = 0x8364, // GL_UNSIGNED_SHORT_5_6_5_REV UInt16_RGBA4 = 0x8033, // GL_UNSIGNED_SHORT_4_4_4_4 UInt16_RGBA4_Rev = 0x8365, // GL_UNSIGNED_SHORT_4_4_4_4_REV + UInt32_RGBA8 = 0x8035, // GL_UNSIGNED_INT_8_8_8_8 + UInt32_RGBA8_Rev = 0x8367, // GL_UNSIGNED_INT_8_8_8_8_REV UInt32_RGB10A2 = 0x8036, // GL_UNSIGNED_INT_10_10_10_2 UInt32_RGB10A2_Rev = 0x8368, // GL_UNSIGNED_INT_2_10_10_10_REV UInt32_D24S8 = 0x84FA, // GL_UNSIGNED_INT_24_8 |