diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-10-20 13:18:59 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-10-22 10:08:51 +0000 |
| commit | 31f9c57bc50ae053cfaf039a1dfdb128e2494458 (patch) | |
| tree | 316138cb73c49877f5a80a8496c2f1b737122fb5 /src/datavisualization/utils/texturehelper.cpp | |
| parent | 4162ddeb02ee41fd4217d7f3d93d45cab3313ba8 (diff) | |
Fix issues with COIN builds
-Fix miscellaneous compile errors
-Move manual tests to manual folder and enable export of autotests
-Added widgets requirement
-Fixed autotests
-Fixed renderer and controller synchronization in QML case
-Treat fallback Mesa as ES2 similar to setting AA_UseSoftwareOpenGL
Change-Id: If6619733725d079e339bef16262e5ea1450ab20f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
Diffstat (limited to 'src/datavisualization/utils/texturehelper.cpp')
| -rw-r--r-- | src/datavisualization/utils/texturehelper.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp index 179525f1..05439665 100644 --- a/src/datavisualization/utils/texturehelper.cpp +++ b/src/datavisualization/utils/texturehelper.cpp @@ -337,7 +337,8 @@ GLuint TextureHelper::createDepthTextureFrameBuffer(const QSize &size, GLuint &f void TextureHelper::deleteTexture(GLuint *texture) { if (texture && *texture) { - glDeleteTextures(1, texture); + if (QOpenGLContext::currentContext()) + glDeleteTextures(1, texture); *texture = 0; } } |