diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-25 15:37:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-25 15:47:42 +0200 |
| commit | aedc59b1c38528f96f0e0cc51bf6c9eeca9dca28 (patch) | |
| tree | 80e38cea91c93736a7d4436642dd46c8b2dd6386 /src/gui/opengl | |
| parent | e3b3dbbe93dbbac196543f62b444b2c044d14907 (diff) | |
| parent | f6db25962e820d7709c2f235f02893dd3edde4f4 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/corelib/io/qstorageinfo_unix.cpp
src/network/ssl/qsslsocket_openssl.cpp
Change-Id: Ibc9ce799bef62d60d616beaa9fbde8ebeadfbc20
Diffstat (limited to 'src/gui/opengl')
| -rw-r--r-- | src/gui/opengl/qopengltextureblitter.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/opengl/qopengltextureblitter.cpp b/src/gui/opengl/qopengltextureblitter.cpp index b65df9dc82..b709f2f639 100644 --- a/src/gui/opengl/qopengltextureblitter.cpp +++ b/src/gui/opengl/qopengltextureblitter.cpp @@ -349,6 +349,9 @@ bool QOpenGLTextureBlitterPrivate::buildProgram(ProgramIndex idx, const char *vs p->glProgram->setUniformValue(p->swizzleUniformPos, false); + // minmize state left set after a create() + p->glProgram->release(); + return true; } |