Bug 1320644 - don't use __stdcall with SkiaGLGlue. r=mchang
authorLee Salzman <lsalzman@mozilla.com>
Wed, 30 Nov 2016 15:12:40 -0500
changeset 324835 25a53a6b7aa16f57825487dbaa17302ab1a4fb21
parent 324834 1309c56ba4cddb537cd990409e05f353926b1a1f
child 324836 27449c736a04eec8c9033d70697747fce3a3c13d
child 324883 21e6ee0766a5bf10613a0d200acd436bdc721e5b
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewersmchang
bugs1320644
milestone53.0a1
Bug 1320644 - don't use __stdcall with SkiaGLGlue. r=mchang MozReview-Commit-ID: 5pljJkGSN8R
gfx/skia/skia/include/config/SkUserConfig.h
--- a/gfx/skia/skia/include/config/SkUserConfig.h
+++ b/gfx/skia/skia/include/config/SkUserConfig.h
@@ -147,16 +147,19 @@
 
 #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 0
 
 #define SK_SUPPORT_LEGACY_GETDEVICE
 #define SK_SUPPORT_LEGACY_GETTOPDEVICE
 
 #define SK_IGNORE_ETC1_SUPPORT
 
+// Don't use __stdcall with SkiaGLGlue - bug 1320644
+#define GR_GL_FUNCTION_TYPE
+
 #define SK_RASTERIZE_EVEN_ROUNDING
 
 #define SK_DISABLE_SCREENSPACE_TESS_AA_PATH_RENDERER
 
 #define SK_DISABLE_SLOW_DEBUG_VALIDATION 1
 
 #define MOZ_SKIA 1