From 83aa1a210395e7740468e034a8f95f054f352f01 Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Thu, 11 Oct 2012 14:08:45 +0100 Subject: OpenGL: Add missing WINAPI calling convention for QGL functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Friedemann Kleint --- src/opengl/qglfunctions.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/opengl/qglfunctions.h') 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 -- cgit v1.2.3