Revert "Add the ANGLEPlatform entry points to eglGetProcAddress"

Produces a build warning in standalone, might require build file updates: > locally defined symbol ANGLEPlatformInitialize imported in function <snip> At least in GYP, libEGL does not have LIBANGLE_IMPLEMENTATION defined, so it defines this API with __declspec(dllimport), which is incorrect, since the function is local to the module. We should fix the layering and/or export defs. BUG=angleproject:1621 This reverts commit 0504fcc1. Change-Id: Ida67db69eb64e4a8f2c13dcf129d40b332f2da9d Reviewed-on: https://chromium-review.googlesource.com/410065Reviewed-by: Jamie Madill <jmadill@chromium.org>

Revert "Add the ANGLEPlatform entry points to eglGetProcAddress"
f58585cb · Jamie Madill · 0504fcc1 · f58585cb
Commit f58585cb authored Nov 11, 2016 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 13 deletions

entry_points_egl.cpp src/libGLESv2/entry_points_egl.cpp +2 -13

No files found.
--- a/src/libGLESv2/entry_points_egl.cpp
+++ b/src/libGLESv2/entry_points_egl.cpp
@@ -24,8 +24,6 @@
 #include "common/debug.h"
 #include "common/version.h"

-#include "platform/Platform.h"
-
 #include <EGL/eglext.h>

 namespace egl
@@ -1277,9 +1275,6 @@ __eglMustCastToProperFunctionPointerType EGLAPIENTRY GetProcAddress(const char *
 #define INSERT_PROC_ADDRESS(ns, proc) \
    map[#ns #proc] = reinterpret_cast<__eglMustCastToProperFunctionPointerType>(ns::proc)

-#define INSERT_PROC_ADDRESS_NO_NS(name, proc) \
-    map[name] = reinterpret_cast<__eglMustCastToProperFunctionPointerType>(proc)
-
        // GLES2 core
        INSERT_PROC_ADDRESS(gl, ActiveTexture);
        INSERT_PROC_ADDRESS(gl, AttachShader);
@@ -1671,8 +1666,8 @@ __eglMustCastToProperFunctionPointerType EGLAPIENTRY GetProcAddress(const char *
        INSERT_PROC_ADDRESS(gl, UniformBlockBinding);
        INSERT_PROC_ADDRESS(gl, DrawArraysInstanced);
        INSERT_PROC_ADDRESS(gl, DrawElementsInstanced);
-        // FenceSync is the name of a class, the function has an added _ to prevent a name conflict.
-        INSERT_PROC_ADDRESS_NO_NS("glFenceSync", gl::FenceSync_);
+        map["glFenceSync"] =
+            reinterpret_cast<__eglMustCastToProperFunctionPointerType>(gl::FenceSync_);
        INSERT_PROC_ADDRESS(gl, IsSync);
        INSERT_PROC_ADDRESS(gl, DeleteSync);
        INSERT_PROC_ADDRESS(gl, ClientWaitSync);
@@ -1875,13 +1870,7 @@ __eglMustCastToProperFunctionPointerType EGLAPIENTRY GetProcAddress(const char *
        // EGL_EXT_swap_buffers_with_damage
        INSERT_PROC_ADDRESS(egl, SwapBuffersWithDamageEXT);

-        // angle::Platform related entry points
-        INSERT_PROC_ADDRESS_NO_NS("ANGLEPlatformInitialize", ANGLEPlatformInitialize);
-        INSERT_PROC_ADDRESS_NO_NS("ANGLEPlatformShutdown", ANGLEPlatformShutdown);
-
 #undef INSERT_PROC_ADDRESS
-#undef INSERT_PROC_ADDRESS_NO_NS
-
        return map;
    };