diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-26 10:13:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-26 10:13:06 +0200 |
| commit | bf08e0bbb28917f1965cd29ed449e553d1d1f4f1 (patch) | |
| tree | ed83933e4f6a9d40c546c85aa136f18ce927dfc8 /src/gui/opengl/qopenglprogrambinarycache_p.h | |
| parent | 547f216efdef3667b0b23ecddce93e5184806800 (diff) | |
| parent | 0ce3f7d62b93427ca5d0f4284ba774691cbbd4a7 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/network/access/qhttpthreaddelegate.cpp
Change-Id: Id47b977587e2d713c16ac17e63c5ec80c2f05ee9
Diffstat (limited to 'src/gui/opengl/qopenglprogrambinarycache_p.h')
| -rw-r--r-- | src/gui/opengl/qopenglprogrambinarycache_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/opengl/qopenglprogrambinarycache_p.h b/src/gui/opengl/qopenglprogrambinarycache_p.h index a0e1f91e254..9fade08e66d 100644 --- a/src/gui/opengl/qopenglprogrambinarycache_p.h +++ b/src/gui/opengl/qopenglprogrambinarycache_p.h @@ -93,6 +93,12 @@ private: uint format; }; QCache<QByteArray, MemCacheEntry> m_memCache; +#if defined(QT_OPENGL_ES_2) + void (QOPENGLF_APIENTRYP programBinaryOES)(GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length); + void (QOPENGLF_APIENTRYP getProgramBinaryOES)(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary); + void initializeProgramBinaryOES(QOpenGLContext *context); + bool m_programBinaryOESInitialized = false; +#endif }; QT_END_NAMESPACE |