Commit 740aa41d by Jamie Madill Committed by Commit Bot

Fix angle::Platform export definitions.

This was only showing up in the GYP build on Windows. BUG=chromium:778918 Change-Id: Ib9db0c928474be887ec1f46d7e99c0a3dedfb9e0 Reviewed-on: https://chromium-review.googlesource.com/768947 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarOlli Etuaho <oetuaho@nvidia.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent f4f293ef
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
#if defined(_WIN32) #if defined(_WIN32)
# if !defined(LIBANGLE_IMPLEMENTATION) # if !defined(LIBANGLE_IMPLEMENTATION)
# define ANGLE_PLATFORM_EXPORT __declspec(dllimport) # define ANGLE_PLATFORM_EXPORT __declspec(dllimport)
# else
# define ANGLE_PLATFORM_EXPORT __declspec(dllexport)
# endif # endif
#elif defined(__GNUC__) || defined(__clang__) #elif defined(__GNUC__) || defined(__clang__)
# define ANGLE_PLATFORM_EXPORT __attribute__((visibility ("default"))) # define ANGLE_PLATFORM_EXPORT __attribute__((visibility ("default")))
...@@ -264,6 +266,8 @@ inline void DefaultCacheProgram(PlatformMethods *platform, ...@@ -264,6 +266,8 @@ inline void DefaultCacheProgram(PlatformMethods *platform,
struct ANGLE_PLATFORM_EXPORT PlatformMethods struct ANGLE_PLATFORM_EXPORT PlatformMethods
{ {
PlatformMethods();
// User data pointer for any implementation specific members. Put it at the start of the // User data pointer for any implementation specific members. Put it at the start of the
// platform structure so it doesn't become overwritten if one version of the platform // platform structure so it doesn't become overwritten if one version of the platform
// adds or removes new members. // adds or removes new members.
......
...@@ -18,6 +18,10 @@ namespace ...@@ -18,6 +18,10 @@ namespace
angle::PlatformMethods g_platformMethods; angle::PlatformMethods g_platformMethods;
} // anonymous namespace } // anonymous namespace
angle::PlatformMethods::PlatformMethods()
{
}
angle::PlatformMethods *ANGLEPlatformCurrent() angle::PlatformMethods *ANGLEPlatformCurrent()
{ {
return &g_platformMethods; return &g_platformMethods;
......
...@@ -410,7 +410,3 @@ EXPORTS ...@@ -410,7 +410,3 @@ EXPORTS
glVertexAttribIFormat @410 glVertexAttribIFormat @410
glVertexAttribBinding @411 glVertexAttribBinding @411
glVertexBindingDivisor @412 glVertexBindingDivisor @412
; ANGLE Platform Implementation
ANGLEGetDisplayPlatform @290
ANGLEResetDisplayPlatform @291
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment