aboutsummaryrefslogtreecommitdiffstats
path: root/src/mapi/glapi
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2015-01-07 14:24:07 +0000
committerJosé Fonseca <[email protected]>2015-01-07 19:35:34 +0000
commitfd1f79f7dda3cbe1b677a74ad1b242603646ffd5 (patch)
tree7461ee4db6fa1a61a8dd7fa8062760f63c1b49f5 /src/mapi/glapi
parent1829f9c928836940fa13b12a8b073f09c26dc782 (diff)
glapi: Force frame pointer elimination on Windows.
To catch mismatches in cdecl vs stdcall calling convention. See code comment for more detailed explanation. Tested with piglit gl-1.0-beginend-coverage (it now also crashes on debug builds.) VMware PR1350505. Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mapi/glapi')
-rw-r--r--src/mapi/glapi/glapi_dispatch.c22
1 files changed, 22 insertions, 0 deletions
diff --git a/src/mapi/glapi/glapi_dispatch.c b/src/mapi/glapi/glapi_dispatch.c
index d2dd9654a07..df907ff9d6a 100644
--- a/src/mapi/glapi/glapi_dispatch.c
+++ b/src/mapi/glapi/glapi_dispatch.c
@@ -144,6 +144,28 @@ GL_API void GL_APIENTRY glTexParameterxv (GLenum target, GLenum pname, const GLf
GL_API void GL_APIENTRY glTranslatex (GLfixed x, GLfixed y, GLfixed z);
GL_API void GL_APIENTRY glPointSizePointerOES (GLenum type, GLsizei stride, const GLvoid *pointer);
+/* Enable frame pointer elimination on Windows, otherwise forgetting to add
+ * APIENTRY to _mesa_* entrypoints will not cause crashes on debug builds, as
+ * the initial ESP value is saved in the EBP in the function prologue, then
+ * restored on the epilogue, clobbering any corruption in the ESP pointer due
+ * to mismatch in the callee calling convention.
+ *
+ * On MSVC it's not sufficient to enable /Oy -- other optimizations must be
+ * enabled or frame pointer will be used regardless.
+ *
+ * We don't do this when NDEBUG is defined since, frame pointer omission
+ * optimization compiler flag are already specified on release builds, and
+ * because on profile builds we must have frame pointers or certain profilers
+ * might fail to unwind the stack.
+ */
+#if defined(_WIN32) && !defined(NDEBUG)
+# if defined(_MSC_VER)
+# pragma optimize( "gty", on )
+# elif defined(__GNUC__)
+# pragma GCC optimize ("omit-frame-pointer")
+# endif
+#endif
+
#include "glapi/glapitemp.h"
#endif /* USE_X86_ASM */