Fix event tracer linking on Linux.

src/common/event_tracer.cpp

@@ -12,17 +12,6 @@ AddTraceEventFunc g_addTraceEvent;
 
 }  // namespace gl
 
-extern "C" {
-
-void TRACE_ENTRY SetTraceFunctionPointers(GetCategoryEnabledFlagFunc getCategoryEnabledFlag,
-                                          AddTraceEventFunc addTraceEvent)
-{
-    gl::g_getCategoryEnabledFlag = getCategoryEnabledFlag;
-    gl::g_addTraceEvent = addTraceEvent;
-}
-
-}  // extern "C"
-
 namespace gl
 {
 

src/common/event_tracer.h

@@ -7,14 +7,6 @@
 
 #include "common/platform.h"
 
-#if !defined(TRACE_ENTRY)
-#   ifdef ANGLE_PLATFORM_WINDOWS
-#       define TRACE_ENTRY __stdcall
-#   else
-#       define TRACE_ENTRY
-#   endif // ANGLE_PLATFORM_WINDOWS
-#endif //TRACE_ENTRY
-
 extern "C" {
 
 typedef const unsigned char* (*GetCategoryEnabledFlagFunc)(const char* name);
@@ -23,15 +15,14 @@ typedef void (*AddTraceEventFunc)(char phase, const unsigned char* categoryGroup
                                   const unsigned char* argTypes, const unsigned long long* argValues,
                                   unsigned char flags);
 
-// extern "C" so that it has a reasonable name for GetProcAddress.
-void TRACE_ENTRY SetTraceFunctionPointers(GetCategoryEnabledFlagFunc get_category_enabled_flag,
-                                          AddTraceEventFunc add_trace_event_func);
-
 }
 
 namespace gl
 {
 
+extern GetCategoryEnabledFlagFunc g_getCategoryEnabledFlag;
+extern AddTraceEventFunc g_addTraceEvent;
+
 const unsigned char* TraceGetTraceCategoryEnabledFlag(const char* name);
 
 void TraceAddTraceEvent(char phase, const unsigned char* categoryGroupEnabled, const char* name, unsigned long long id,

src/libGLESv2.gypi

@@ -14,8 +14,6 @@
             'common/blocklayout.h',
             'common/debug.cpp',
             'common/debug.h',
-            'common/event_tracer.cpp',
-            'common/event_tracer.h',
             'common/mathutil.cpp',
             'common/mathutil.h',
             'common/platform.h',
@@ -43,6 +41,8 @@
         ],
         'libangle_sources':
         [
+            'common/event_tracer.cpp',
+            'common/event_tracer.h',
             'libANGLE/AttributeMap.cpp',
             'libANGLE/AttributeMap.h',
             'libANGLE/BinaryStream.h',
@@ -565,8 +565,6 @@
                 'common/angleutils.h',
                 'common/debug.cpp',
                 'common/debug.h',
-                'common/event_tracer.cpp',
-                'common/event_tracer.h',
                 'common/tls.cpp',
                 'common/tls.h',
                 'libGLESv2/libGLESv2.cpp',

src/libGLESv2/libGLESv2.cpp

@@ -30,6 +30,7 @@
 
 #include "common/utilities.h"
 #include "common/version.h"
+#include "common/event_tracer.h"
 
 extern "C"
 {
@@ -8819,4 +8820,11 @@ void GL_APIENTRY glFlushMappedBufferRangeEXT (GLenum target, GLintptr offset, GL
     }
 }
 
+void GL_APIENTRY SetTraceFunctionPointers(GetCategoryEnabledFlagFunc getCategoryEnabledFlag,
+                                          AddTraceEventFunc addTraceEvent)
+{
+    gl::g_getCategoryEnabledFlag = getCategoryEnabledFlag;
+    gl::g_addTraceEvent = addTraceEvent;
+}
+
 }