diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-24 16:27:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-05-24 16:29:14 +0200 |
| commit | f82e5085169876e0ec7c1b744d021b068c281cfe (patch) | |
| tree | a870e1f68ce62818a0793c4c78a67971e841e676 /src/platformsupport | |
| parent | f74d4fb1dacc682e2e6f4a44e4240f642a2c3b70 (diff) | |
| parent | ee47999333dde1d38b73d04e142e05f06f8c56ed (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
mkspecs/features/qt_common.prf
src/corelib/tools/qstring.cpp
src/plugins/platforms/windows/qwindowsmousehandler.cpp
src/widgets/widgets/qmainwindowlayout_p.h
Change-Id: I5df613008f6336f69b257d08e49a133d033a9d65
Diffstat (limited to 'src/platformsupport')
| -rw-r--r-- | src/platformsupport/eglconvenience/qeglplatformcontext.cpp | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp index 7a9a98573e..9d8bf07af8 100644 --- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp +++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp @@ -792,6 +792,53 @@ QFunctionPointer QEGLPlatformContext::getProcAddress(const char *procName) { "glVertexAttribIFormat", (QFunctionPointer) ::glVertexAttribIFormat }, { "glVertexBindingDivisor", (QFunctionPointer) ::glVertexBindingDivisor }, #endif // QT_OPENGL_ES_3_1 + +#ifdef QT_OPENGL_ES_3_2 + { "glBlendBarrier", (QFunctionPointer) ::glBlendBarrier }, + { "glCopyImageSubData", (QFunctionPointer) ::glCopyImageSubData }, + { "glDebugMessageControl", (QFunctionPointer) ::glDebugMessageControl }, + { "glDebugMessageInsert", (QFunctionPointer) ::glDebugMessageInsert }, + { "glDebugMessageCallback", (QFunctionPointer) ::glDebugMessageCallback }, + { "glGetDebugMessageLog", (QFunctionPointer) ::glGetDebugMessageLog }, + { "glPushDebugGroup", (QFunctionPointer) ::glPushDebugGroup }, + { "glPopDebugGroup", (QFunctionPointer) ::glPopDebugGroup }, + { "glObjectLabel", (QFunctionPointer) ::glObjectLabel }, + { "glGetObjectLabel", (QFunctionPointer) ::glGetObjectLabel }, + { "glObjectPtrLabel", (QFunctionPointer) ::glObjectPtrLabel }, + { "glGetObjectPtrLabel", (QFunctionPointer) ::glGetObjectPtrLabel }, + { "glGetPointerv", (QFunctionPointer) ::glGetPointerv }, + { "glEnablei", (QFunctionPointer) ::glEnablei }, + { "glDisablei", (QFunctionPointer) ::glDisablei }, + { "glBlendEquationi", (QFunctionPointer) ::glBlendEquationi }, + { "glBlendEquationSeparatei", (QFunctionPointer) ::glBlendEquationSeparatei }, + { "glBlendFunci", (QFunctionPointer) ::glBlendFunci }, + { "glBlendFuncSeparatei", (QFunctionPointer) ::glBlendFuncSeparatei }, + { "glColorMaski", (QFunctionPointer) ::glColorMaski }, + { "glIsEnabledi", (QFunctionPointer) ::glIsEnabledi }, + { "glDrawElementsBaseVertex", (QFunctionPointer) ::glDrawElementsBaseVertex }, + { "glDrawRangeElementsBaseVertex", (QFunctionPointer) ::glDrawRangeElementsBaseVertex }, + { "glDrawElementsInstancedBaseVertex", (QFunctionPointer) ::glDrawElementsInstancedBaseVertex }, + { "glFramebufferTexture", (QFunctionPointer) ::glFramebufferTexture }, + { "glPrimitiveBoundingBox", (QFunctionPointer) ::glPrimitiveBoundingBox }, + { "glGetGraphicsResetStatus", (QFunctionPointer) ::glGetGraphicsResetStatus }, + { "glReadnPixels", (QFunctionPointer) ::glReadnPixels }, + { "glGetnUniformfv", (QFunctionPointer) ::glGetnUniformfv }, + { "glGetnUniformiv", (QFunctionPointer) ::glGetnUniformiv }, + { "glGetnUniformuiv", (QFunctionPointer) ::glGetnUniformuiv }, + { "glMinSampleShading", (QFunctionPointer) ::glMinSampleShading }, + { "glPatchParameteri", (QFunctionPointer) ::glPatchParameteri }, + { "glTexParameterIiv", (QFunctionPointer) ::glTexParameterIiv }, + { "glTexParameterIuiv", (QFunctionPointer) ::glTexParameterIuiv }, + { "glGetTexParameterIiv", (QFunctionPointer) ::glGetTexParameterIiv }, + { "glGetTexParameterIuiv", (QFunctionPointer) ::glGetTexParameterIuiv }, + { "glSamplerParameterIiv", (QFunctionPointer) ::glSamplerParameterIiv }, + { "glSamplerParameterIuiv", (QFunctionPointer) ::glSamplerParameterIuiv }, + { "glGetSamplerParameterIiv", (QFunctionPointer) ::glGetSamplerParameterIiv }, + { "glGetSamplerParameterIuiv", (QFunctionPointer) ::glGetSamplerParameterIuiv }, + { "glTexBuffer", (QFunctionPointer) ::glTexBuffer }, + { "glTexBufferRange", (QFunctionPointer) ::glTexBufferRange }, + { "glTexStorage3DMultisample", (QFunctionPointer) ::glTexStorage3DMultisample }, +#endif // QT_OPENGL_ES_3_2 }; for (size_t i = 0; i < sizeof(standardFuncs) / sizeof(StdFunc); ++i) { |