diff options
| author | Yoann Lopes <yoann.lopes@qt.io> | 2016-08-01 11:52:05 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-08-01 11:52:05 +0200 |
| commit | 339944b284e9dd11302dd013f9d9a10ad0d9055a (patch) | |
| tree | c2952d186b1dbc6f2380448fa2cfd9ec55043da6 /src/plugins/android/src/common | |
| parent | 53d0a1e5454f4e5beecdea19acb9df11c87cc375 (diff) | |
| parent | d7d31d63db5f0029a4a5e24d998601baee8bade0 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ic29cb09048003f18ff86d4546cd547be715eaec8
Diffstat (limited to 'src/plugins/android/src/common')
| -rw-r--r-- | src/plugins/android/src/common/qandroidvideooutput.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/android/src/common/qandroidvideooutput.cpp b/src/plugins/android/src/common/qandroidvideooutput.cpp index 5c804ccc4..a5cd3580b 100644 --- a/src/plugins/android/src/common/qandroidvideooutput.cpp +++ b/src/plugins/android/src/common/qandroidvideooutput.cpp @@ -147,7 +147,13 @@ public: delete m_program; } - void setTexture(quint32 id) { m_textureID = id; } + void setTexture(quint32 id) { + if (m_textureID) + glDeleteTextures(1, &m_textureID); + + m_textureID = id; + } + void setFbo(QOpenGLFramebufferObject *fbo) { m_fbo = fbo; } void setShaderProgram(QOpenGLShaderProgram *prog) { m_program = prog; } |