diff options
| author | Tasuku Suzuki <stasuku@gmail.com> | 2014-05-20 15:04:35 +0900 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-23 02:20:26 +0200 |
| commit | 390a8c36f7a59db4c3fe92d0c28ef084ebb92954 (patch) | |
| tree | 93003780ea4e0d190edc49176864622fd99db85d /src/gui/opengl/qopengltexture.cpp | |
| parent | a591c272820c623e3bfcf0aea39209f4a03d341d (diff) | |
Fix a crash in QOpenGLTexture::allocateStorage()
QOpenGLTexture texture(QOpenGLTexture::Target2D);
texture.allocateStorage(); // crashed
Change-Id: Ia12f69b72e537cf765387cd172d7cb2cbbbad6e6
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/gui/opengl/qopengltexture.cpp')
| -rw-r--r-- | src/gui/opengl/qopengltexture.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/opengl/qopengltexture.cpp b/src/gui/opengl/qopengltexture.cpp index e3444332a0..6b6d4bcf41 100644 --- a/src/gui/opengl/qopengltexture.cpp +++ b/src/gui/opengl/qopengltexture.cpp @@ -2081,7 +2081,9 @@ int QOpenGLTexture::faces() const void QOpenGLTexture::allocateStorage() { Q_D(QOpenGLTexture); - d->allocateStorage(); + if (d->create()) { + d->allocateStorage(); + } } /*! |