Fix counting of the new platform methods.

The context pointer was throwing off the count by one. Also change the type to void * for ease of use. BUG=angleproject:1892 BUG=chromium:678870 Change-Id: Iffac667f0aa896d9247e9ffddfeb3bc447a9692f Reviewed-on: https://chromium-review.googlesource.com/441931Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Fix counting of the new platform methods.
dbffdfbd · Jamie Madill · Commit Bot · b1eeba1f · dbffdfbd · dbffdfbd
Commit dbffdfbd authored Feb 13, 2017 by Jamie Madill Committed by Commit Bot Feb 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

Platform.h include/platform/Platform.h +4 -3

Platform.cpp src/libANGLE/Platform.cpp +1 -1

No files found.
--- a/include/platform/Platform.h
+++ b/include/platform/Platform.h
@@ -351,12 +351,13 @@ struct PlatformMethods
    ANGLE_PLATFORM_OP(ANGLE_PLATFORM_METHOD_DEF);

    // User data pointer for any implementation specific members.
-    uintptr_t context = 0;
+    void *context = 0;
 };

 #undef ANGLE_PLATFORM_METHOD_DEF

-constexpr unsigned int g_NumPlatformMethods = sizeof(PlatformMethods) / sizeof(uintptr_t);
+// Subtrace one to account for the context pointer.
+constexpr unsigned int g_NumPlatformMethods = (sizeof(PlatformMethods) / sizeof(uintptr_t)) - 1;

 #define ANGLE_PLATFORM_METHOD_STRING(Name) #Name
 #define ANGLE_PLATFORM_METHOD_STRING2(Name) ANGLE_PLATFORM_METHOD_STRING(Name),
@@ -379,7 +380,7 @@ ANGLE_PLATFORM_EXPORT bool ANGLE_APIENTRY
 ANGLEGetDisplayPlatform(angle::EGLDisplayType display,
                        const char *const methodNames[],
                        unsigned int methodNameCount,
-                        uintptr_t context,
+                        void *context,
                        angle::PlatformMethods **platformMethodsOut);

 // Sets the platform methods back to their defaults.

--- a/src/libANGLE/Platform.cpp
+++ b/src/libANGLE/Platform.cpp
@@ -146,7 +146,7 @@ void ANGLE_APIENTRY ANGLEPlatformShutdown()
 bool ANGLE_APIENTRY ANGLEGetDisplayPlatform(angle::EGLDisplayType display,
                                            const char *const methodNames[],
                                            unsigned int methodNameCount,
-                                            uintptr_t context,
+                                            void *context,
                                            angle::PlatformMethods **platformMethodsOut)
 {
    // We allow for a lower input count of impl platform methods if the subset is correct.