diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2012-10-11 14:08:45 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-13 05:51:19 +0200 |
commit | 83aa1a210395e7740468e034a8f95f054f352f01 (patch) | |
tree | 82870b8da66f49d58f80cbb6eb2d353c8e05536e /src/opengl | |
parent | e24dd4d48f73bb6988f7b88ff94a2aa589f7518b (diff) |
OpenGL: Add missing WINAPI calling convention for QGL functions
This is the QGL equivalent of commit
602cab9bb2072c5564bbb43c4125e04f98266043
Without this QGLExtensionMatcher causes stack corruption when using
a core profile GL context due to the call to glGetStringi() with
an incorrect calling convention.
Change-Id: Ibd86645e04df8c650c182fecfc8c481dae8a75b2
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/opengl')
-rw-r--r-- | src/opengl/qglfunctions.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/opengl/qglfunctions.h b/src/opengl/qglfunctions.h index 3989063f96..4318f538df 100644 --- a/src/opengl/qglfunctions.h +++ b/src/opengl/qglfunctions.h @@ -61,6 +61,9 @@ QT_BEGIN_NAMESPACE typedef ptrdiff_t qgl_GLintptr; typedef ptrdiff_t qgl_GLsizeiptr; +#if defined(APIENTRY) && !defined(QGLF_APIENTRY) +# define QGLF_APIENTRY APIENTRY +#endif # ifndef QGLF_APIENTRYP # ifdef QGLF_APIENTRY |