add TRACE_EVENT to ANGLE (reland)

Tracing code the same as previous CL: https://codereview.appspot.com/12699047/ Setup code simplified, and follows the GetProcAddress model of other gl functions. R=shannonwoods@google.com

add TRACE_EVENT to ANGLE (reland)
3cf1f4ea · Al Patrick · d0310437 · 3cf1f4ea · 3cf1f4ea · 3cf1f4ea
Commit 3cf1f4ea authored Aug 14, 2013 by Al Patrick
11 changed files
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
 # This is the official list of people who can contribute
 # (and who have contributed) code to the ANGLE project
 # repository.
 # The AUTHORS file lists the copyright holders; this file
 # lists people.  For example, Google employees are listed here
 # but not in AUTHORS, because Google holds the copyright.
 #
 TransGaming Inc.
 Nicolas Capens
 Daniel Koch
 Geoff Lang
 Andrew Lewycky
 Jamie Madill
 Gavriel State
 Shannon Woods
 Google Inc.
 Brent Austin
 Michael Bai
 John Bauman
 Peter Beverloo
 Steve Block
 Rachel Blum
 Eric Boren
 Henry Bridge
 Nat Duca
 Peter Kasting
 Vangelis Kokkevis
 Zhenyao Mo
 Daniel Nicoara
 Alastair Patrick
 Alok Priyadarshi
 Kenneth Russell
 Brian Salomon
 Gregg Tavares
 Jeff Timanus
 Ben Vanik
 Adrienne Walker
 thestig@chromium.org
 Justin Schuh
+ Scott Graham
-Adobe Systems Inc.
- Alexandru Chiculita
+Adobe Systems Inc.
- Steve Minns
+ Alexandru Chiculita
- Max Vujovic
+ Steve Minns
+ Max Vujovic
-Autodesk, Inc.
- Ranger Harke
+Autodesk, Inc.
+ Ranger Harke
-Cloud Party, Inc.
- Conor Dickinson
+Cloud Party, Inc.
+ Conor Dickinson
-Intel Corporation
- Jin Yang
+Intel Corporation
- Andy Chen
+ Jin Yang
- Josh Triplett
+ Andy Chen
+ Josh Triplett
-Klarälvdalens Datakonsult AB
- Milian Wolff
+Klarälvdalens Datakonsult AB
+ Milian Wolff
-Mozilla Corp.
- Ehsan Akhgari
+Mozilla Corp.
- Jeff Gilbert
+ Ehsan Akhgari
- Mike Hommey
+ Jeff Gilbert
- Benoit Jacob
+ Mike Hommey
- Makoto Kato
+ Benoit Jacob
- Vladimir Vukicevic
+ Makoto Kato
+ Vladimir Vukicevic
-Turbulenz
- Michael Braithwaite
+Turbulenz
+ Michael Braithwaite
-Ulrik Persson (ddefrostt)
-Mark Banner (standard8mbp)
+Ulrik Persson (ddefrostt)
-David Kilzer
+Mark Banner (standard8mbp)
+David Kilzer
--- a/src/build_angle.gypi
+++ b/src/build_angle.gypi
@@ -228,9 +228,12 @@
          'sources': [
            'third_party/murmurhash/MurmurHash3.h',
            'third_party/murmurhash/MurmurHash3.cpp',
+            'third_party/trace_event/trace_event.h',
            'common/angleutils.h',
            'common/debug.cpp',
            'common/debug.h',
+            'common/event_tracer.cpp',
+            'common/event_tracer.h',
            'common/RefCountObject.cpp',
            'common/RefCountObject.h',
            'common/version.h',

--- a/src/common/event_tracer.cpp
+++ b/src/common/event_tracer.cpp
+// Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+#include "common/event_tracer.h"
+namespace gl
+{
+GetCategoryEnabledFlagFunc g_getCategoryEnabledFlag;
+AddTraceEventFunc g_addTraceEvent;
+}  // namespace gl
+extern "C" {
+void __stdcall SetTraceFunctionPointers(GetCategoryEnabledFlagFunc getCategoryEnabledFlag,
+                                        AddTraceEventFunc addTraceEvent)
+{
+    gl::g_getCategoryEnabledFlag = getCategoryEnabledFlag;
+    gl::g_addTraceEvent = addTraceEvent;
+}
+}  // extern "C"
+namespace gl
+{
+const unsigned char* TraceGetTraceCategoryEnabledFlag(const char* name)
+{
+    if (g_getCategoryEnabledFlag)
+    {
+        return g_getCategoryEnabledFlag(name);
+    }
+    static unsigned char disabled = 0;
+    return &disabled;
+}
+void TraceAddTraceEvent(char phase, const unsigned char* categoryGroupEnabled, const char* name, unsigned long long id,
+                        int numArgs, const char** argNames, const unsigned char* argTypes,
+                        const unsigned long long* argValues, unsigned char flags)
+{
+    if (g_addTraceEvent)
+    {
+        g_addTraceEvent(phase, categoryGroupEnabled, name, id, numArgs, argNames, argTypes, argValues, flags);
+    }
+}
+}  // namespace gl
--- a/src/common/event_tracer.h
+++ b/src/common/event_tracer.h
+// Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+#ifndef COMMON_EVENT_TRACER_H_
+#define COMMON_EVENT_TRACER_H_
+extern "C" {
+typedef const unsigned char* (*GetCategoryEnabledFlagFunc)(const char* name);
+typedef void (*AddTraceEventFunc)(char phase, const unsigned char* categoryGroupEnabled, const char* name,
+                                  unsigned long long id, int numArgs, const char** argNames,
+                                  const unsigned char* argTypes, const unsigned long long* argValues,
+                                  unsigned char flags);
+// extern "C" so that it has a reasonable name for GetProcAddress.
+void __stdcall SetTraceFunctionPointers(GetCategoryEnabledFlagFunc get_category_enabled_flag,
+                                        AddTraceEventFunc add_trace_event_func);
+}
+namespace gl
+{
+const unsigned char* TraceGetTraceCategoryEnabledFlag(const char* name);
+void TraceAddTraceEvent(char phase, const unsigned char* categoryGroupEnabled, const char* name, unsigned long long id,
+                        int numArgs, const char** argNames, const unsigned char* argTypes,
+                        const unsigned long long* argValues, unsigned char flags);
+}
+#endif  // COMMON_EVENT_TRACER_H_
--- a/src/common/version.h
+++ b/src/common/version.h
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 2
 #define BUILD_VERSION 0
-#define BUILD_REVISION 2435
+#define BUILD_REVISION 2436
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

--- a/src/libGLESv2/libGLESv2.def
+++ b/src/libGLESv2/libGLESv2.def
@@ -182,4 +182,7 @@ EXPORTS
    glGetProcAddress                @148 NONAME
    glBindTexImage                  @158 NONAME
    glCreateRenderer                @177 NONAME
    glDestroyRenderer               @178 NONAME
\ No newline at end of file
+    ; Setting up TRACE macro callbacks
+    SetTraceFunctionPointers        @180
--- a/src/libGLESv2/libGLESv2.vcxproj
+++ b/src/libGLESv2/libGLESv2.vcxproj
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|x64">
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|x64">
      <Configuration>Release</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{B5871A7A-968C-42E3-A33B-981E6F448E78}</ProjectGuid>
    <RootNamespace>libGLESv2</RootNamespace>
    <Keyword>Win32Proj</Keyword>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization>true</WholeProgramOptimization>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization>true</WholeProgramOptimization>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IncludePath)</IncludePath>
    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LibraryPath)</LibraryPath>
    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IncludePath)</IncludePath>
    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LibraryPath)</LibraryPath>
    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IncludePath)</IncludePath>
    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IncludePath)</IncludePath>
    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LibraryPath)</LibraryPath>
    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LibraryPath)</LibraryPath>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/..; $(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <WarningLevel>Level4</WarningLevel>
      <TreatWarningAsError>true</TreatWarningAsError>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
      <AdditionalDependencies>d3d9.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
    <PostBuildEvent>
      <Command>%40echo on
 mkdir "$(ProjectDir)..\..\lib\$(Configuration)\"
 copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\lib\$(Configuration)\"
 copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
 %40echo off
 </Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/..; $(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>ANGLE_DISABLE_TRACE;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <WarningLevel>Level4</WarningLevel>
      <TreatWarningAsError>true</TreatWarningAsError>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;4718;%(DisableSpecificWarnings)</DisableSpecificWarnings>
      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
      <AdditionalDependencies>d3d9.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
      <ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
    <PostBuildEvent>
      <Command>%40echo on
 mkdir "$(ProjectDir)..\..\lib\$(Configuration)\"
 copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\lib\$(Configuration)\"
 copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
 %40echo off
 </Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <Midl>
      <TargetEnvironment>X64</TargetEnvironment>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>$(ProjectDir)/..; $(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <WarningLevel>Level4</WarningLevel>
      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;4718;%(DisableSpecificWarnings)</DisableSpecificWarnings>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <TreatWarningAsError>true</TreatWarningAsError>
      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
      <AdditionalDependencies>d3d9.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
    <PostBuildEvent>
      <Command>%40echo on
 mkdir "$(ProjectDir)..\..\lib\$(Configuration)\"
 copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\lib\$(Configuration)\"
 copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
 %40echo off
 </Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <Midl>
      <TargetEnvironment>X64</TargetEnvironment>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
      <AdditionalIncludeDirectories>$(ProjectDir)/..; $(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <WarningLevel>Level4</WarningLevel>
      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;4718;%(DisableSpecificWarnings)</DisableSpecificWarnings>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <TreatWarningAsError>true</TreatWarningAsError>
      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
      <AdditionalDependencies>d3d9.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
      <ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
    <PostBuildEvent>
      <Command>%40echo on
 mkdir "$(ProjectDir)..\..\lib\$(Configuration)\"
 copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\lib\$(Configuration)\"
 copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
 %40echo off
 </Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="..\third_party\murmurhash\MurmurHash3.cpp">
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
    </ClCompile>
    <ClCompile Include="Buffer.cpp" />
    <ClCompile Include="Context.cpp" />
    <ClCompile Include="..\common\debug.cpp">
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
    </ClCompile>
-    <ClCompile Include="Fence.cpp" />
+    <ClCompile Include="..\common\event_tracer.cpp">
-    <ClCompile Include="Float16ToFloat32.cpp" />
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-    <ClCompile Include="Framebuffer.cpp" />
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-    <ClCompile Include="HandleAllocator.cpp" />
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-    <ClCompile Include="libGLESv2.cpp" />
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-    <ClCompile Include="main.cpp" />
+    </ClCompile>
-    <ClCompile Include="precompiled.cpp">
+    <ClCompile Include="Fence.cpp" />
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+    <ClCompile Include="Float16ToFloat32.cpp" />
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    <ClCompile Include="Framebuffer.cpp" />
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+    <ClCompile Include="HandleAllocator.cpp" />
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    <ClCompile Include="libGLESv2.cpp" />
-    </ClCompile>
+    <ClCompile Include="main.cpp" />
-    <ClCompile Include="Program.cpp" />
+    <ClCompile Include="precompiled.cpp">
-    <ClCompile Include="ProgramBinary.cpp" />
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-    <ClCompile Include="Query.cpp" />
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-    <ClCompile Include="..\common\RefCountObject.cpp" />
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-    <ClCompile Include="Renderbuffer.cpp" />
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    <ClCompile Include="renderer\Blit.cpp" />
+    </ClCompile>
-    <ClCompile Include="renderer\Fence11.cpp" />
+    <ClCompile Include="Program.cpp" />
-    <ClCompile Include="renderer\Fence9.cpp" />
+    <ClCompile Include="ProgramBinary.cpp" />
-    <ClCompile Include="renderer\BufferStorage.cpp" />
+    <ClCompile Include="Query.cpp" />
-    <ClCompile Include="renderer\BufferStorage11.cpp" />
+    <ClCompile Include="..\common\RefCountObject.cpp" />
-    <ClCompile Include="renderer\BufferStorage9.cpp" />
+    <ClCompile Include="Renderbuffer.cpp" />
-    <ClCompile Include="renderer\Image.cpp" />
+    <ClCompile Include="renderer\Blit.cpp" />
-    <ClCompile Include="renderer\Image9.cpp" />
+    <ClCompile Include="renderer\Fence11.cpp" />
-    <ClCompile Include="renderer\IndexBuffer.cpp" />
+    <ClCompile Include="renderer\Fence9.cpp" />
-    <ClCompile Include="renderer\IndexBuffer11.cpp" />
+    <ClCompile Include="renderer\BufferStorage.cpp" />
-    <ClCompile Include="renderer\IndexBuffer9.cpp" />
+    <ClCompile Include="renderer\BufferStorage11.cpp" />
-    <ClCompile Include="renderer\IndexDataManager.cpp" />
+    <ClCompile Include="renderer\BufferStorage9.cpp" />
-    <ClCompile Include="renderer\ImageSSE2.cpp" />
+    <ClCompile Include="renderer\Image.cpp" />
-    <ClCompile Include="renderer\Image11.cpp" />
+    <ClCompile Include="renderer\Image9.cpp" />
-    <ClCompile Include="renderer\IndexRangeCache.cpp" />
+    <ClCompile Include="renderer\IndexBuffer.cpp" />
-    <ClCompile Include="renderer\InputLayoutCache.cpp" />
+    <ClCompile Include="renderer\IndexBuffer11.cpp" />
-    <ClCompile Include="renderer\Query11.cpp" />
+    <ClCompile Include="renderer\IndexBuffer9.cpp" />
-    <ClCompile Include="renderer\Query9.cpp" />
+    <ClCompile Include="renderer\IndexDataManager.cpp" />
-    <ClCompile Include="renderer\Renderer.cpp" />
+    <ClCompile Include="renderer\ImageSSE2.cpp" />
-    <ClCompile Include="renderer\Renderer11.cpp" />
+    <ClCompile Include="renderer\Image11.cpp" />
-    <ClCompile Include="renderer\renderer11_utils.cpp" />
+    <ClCompile Include="renderer\IndexRangeCache.cpp" />
-    <ClCompile Include="renderer\Renderer9.cpp" />
+    <ClCompile Include="renderer\InputLayoutCache.cpp" />
-    <ClCompile Include="renderer\renderer9_utils.cpp" />
+    <ClCompile Include="renderer\Query11.cpp" />
-    <ClCompile Include="renderer\RenderTarget11.cpp" />
+    <ClCompile Include="renderer\Query9.cpp" />
-    <ClCompile Include="renderer\RenderTarget9.cpp" />
+    <ClCompile Include="renderer\Renderer.cpp" />
-    <ClCompile Include="renderer\RenderStateCache.cpp" />
+    <ClCompile Include="renderer\Renderer11.cpp" />
-    <ClCompile Include="renderer\ShaderExecutable11.cpp" />
+    <ClCompile Include="renderer\renderer11_utils.cpp" />
-    <ClCompile Include="renderer\ShaderExecutable9.cpp" />
+    <ClCompile Include="renderer\Renderer9.cpp" />
-    <ClCompile Include="renderer\SwapChain11.cpp" />
+    <ClCompile Include="renderer\renderer9_utils.cpp" />
-    <ClCompile Include="renderer\SwapChain9.cpp" />
+    <ClCompile Include="renderer\RenderTarget11.cpp" />
-    <ClCompile Include="renderer\TextureStorage.cpp" />
+    <ClCompile Include="renderer\RenderTarget9.cpp" />
-    <ClCompile Include="renderer\TextureStorage11.cpp" />
+    <ClCompile Include="renderer\RenderStateCache.cpp" />
-    <ClCompile Include="renderer\TextureStorage9.cpp" />
+    <ClCompile Include="renderer\ShaderExecutable11.cpp" />
-    <ClCompile Include="renderer\VertexBuffer.cpp" />
+    <ClCompile Include="renderer\ShaderExecutable9.cpp" />
-    <ClCompile Include="renderer\VertexBuffer11.cpp" />
+    <ClCompile Include="renderer\SwapChain11.cpp" />
-    <ClCompile Include="renderer\VertexBuffer9.cpp" />
+    <ClCompile Include="renderer\SwapChain9.cpp" />
-    <ClCompile Include="renderer\VertexDataManager.cpp" />
+    <ClCompile Include="renderer\TextureStorage.cpp" />
-    <ClCompile Include="renderer\VertexDeclarationCache.cpp" />
+    <ClCompile Include="renderer\TextureStorage11.cpp" />
-    <ClCompile Include="ResourceManager.cpp" />
+    <ClCompile Include="renderer\TextureStorage9.cpp" />
-    <ClCompile Include="Shader.cpp" />
+    <ClCompile Include="renderer\VertexBuffer.cpp" />
-    <ClCompile Include="Texture.cpp" />
+    <ClCompile Include="renderer\VertexBuffer11.cpp" />
-    <ClCompile Include="Uniform.cpp" />
+    <ClCompile Include="renderer\VertexBuffer9.cpp" />
-    <ClCompile Include="utilities.cpp" />
+    <ClCompile Include="renderer\VertexDataManager.cpp" />
-  </ItemGroup>
+    <ClCompile Include="renderer\VertexDeclarationCache.cpp" />
-  <ItemGroup>
+    <ClCompile Include="ResourceManager.cpp" />
-    <ClInclude Include="..\common\debug.h" />
+    <ClCompile Include="Shader.cpp" />
-    <ClInclude Include="..\common\system.h" />
+    <ClCompile Include="Texture.cpp" />
-    <ClInclude Include="..\third_party\murmurhash\MurmurHash3.h" />
+    <ClCompile Include="Uniform.cpp" />
-    <ClInclude Include="angletypes.h" />
+    <ClCompile Include="utilities.cpp" />
-    <ClInclude Include="BinaryStream.h" />
+  </ItemGroup>
-    <ClInclude Include="Buffer.h" />
+  <ItemGroup>
-    <ClInclude Include="constants.h" />
+    <ClInclude Include="..\common\debug.h" />
-    <ClInclude Include="Context.h" />
+    <ClInclude Include="..\common\event_tracer.h" />
-    <ClInclude Include="Fence.h" />
+    <ClInclude Include="..\common\system.h" />
-    <ClInclude Include="Framebuffer.h" />
+    <ClInclude Include="..\third_party\murmurhash\MurmurHash3.h" />
-    <ClInclude Include="..\..\include\GLES2\gl2.h" />
+    <ClInclude Include="..\third_party\trace_event\trace_event.h" />
-    <ClInclude Include="..\..\include\GLES2\gl2ext.h" />
+    <ClInclude Include="angletypes.h" />
-    <ClInclude Include="..\..\include\GLES2\gl2platform.h" />
+    <ClInclude Include="BinaryStream.h" />
-    <ClInclude Include="HandleAllocator.h" />
+    <ClInclude Include="Buffer.h" />
-    <ClInclude Include="main.h" />
+    <ClInclude Include="constants.h" />
-    <ClInclude Include="mathutil.h" />
+    <ClInclude Include="Context.h" />
-    <ClInclude Include="precompiled.h" />
+    <ClInclude Include="Fence.h" />
-    <ClInclude Include="Program.h" />
+    <ClInclude Include="Framebuffer.h" />
-    <ClInclude Include="ProgramBinary.h" />
+    <ClInclude Include="..\..\include\GLES2\gl2.h" />
-    <ClInclude Include="Query.h" />
+    <ClInclude Include="..\..\include\GLES2\gl2ext.h" />
-    <ClInclude Include="..\common\RefCountObject.h" />
+    <ClInclude Include="..\..\include\GLES2\gl2platform.h" />
-    <ClInclude Include="Renderbuffer.h" />
+    <ClInclude Include="HandleAllocator.h" />
-    <ClInclude Include="renderer\Blit.h" />
+    <ClInclude Include="main.h" />
-    <ClInclude Include="renderer\Fence11.h" />
+    <ClInclude Include="mathutil.h" />
-    <ClInclude Include="renderer\Fence9.h" />
+    <ClInclude Include="precompiled.h" />
-    <ClInclude Include="renderer\FenceImpl.h" />
+    <ClInclude Include="Program.h" />
-    <ClInclude Include="renderer\BufferStorage.h" />
+    <ClInclude Include="ProgramBinary.h" />
-    <ClInclude Include="renderer\BufferStorage11.h" />
+    <ClInclude Include="Query.h" />
-    <ClInclude Include="renderer\BufferStorage9.h" />
+    <ClInclude Include="..\common\RefCountObject.h" />
-    <ClInclude Include="renderer\generatemip.h" />
+    <ClInclude Include="Renderbuffer.h" />
-    <ClInclude Include="renderer\Image.h" />
+    <ClInclude Include="renderer\Blit.h" />
-    <ClInclude Include="renderer\Image11.h" />
+    <ClInclude Include="renderer\Fence11.h" />
-    <ClInclude Include="renderer\Image9.h" />
+    <ClInclude Include="renderer\Fence9.h" />
-    <ClInclude Include="renderer\IndexBuffer.h" />
+    <ClInclude Include="renderer\FenceImpl.h" />
-    <ClInclude Include="renderer\IndexBuffer11.h" />
+    <ClInclude Include="renderer\BufferStorage.h" />
-    <ClInclude Include="renderer\IndexBuffer9.h" />
+    <ClInclude Include="renderer\BufferStorage11.h" />
-    <ClInclude Include="renderer\IndexDataManager.h" />
+    <ClInclude Include="renderer\BufferStorage9.h" />
-    <ClInclude Include="renderer\IndexRangeCache.h" />
+    <ClInclude Include="renderer\generatemip.h" />
-    <ClInclude Include="renderer\InputLayoutCache.h" />
+    <ClInclude Include="renderer\Image.h" />
-    <ClInclude Include="renderer\Query11.h" />
+    <ClInclude Include="renderer\Image11.h" />
-    <ClInclude Include="renderer\QueryImpl.h" />
+    <ClInclude Include="renderer\Image9.h" />
-    <ClInclude Include="renderer\Query9.h" />
+    <ClInclude Include="renderer\IndexBuffer.h" />
-    <ClInclude Include="renderer\Renderer.h" />
+    <ClInclude Include="renderer\IndexBuffer11.h" />
-    <ClInclude Include="renderer\Renderer11.h" />
+    <ClInclude Include="renderer\IndexBuffer9.h" />
-    <ClInclude Include="renderer\renderer11_utils.h" />
+    <ClInclude Include="renderer\IndexDataManager.h" />
-    <ClInclude Include="renderer\Renderer9.h" />
+    <ClInclude Include="renderer\IndexRangeCache.h" />
-    <ClInclude Include="renderer\renderer9_utils.h" />
+    <ClInclude Include="renderer\InputLayoutCache.h" />
-    <ClInclude Include="renderer\RenderTarget.h" />
+    <ClInclude Include="renderer\Query11.h" />
-    <ClInclude Include="renderer\RenderTarget11.h" />
+    <ClInclude Include="renderer\QueryImpl.h" />
-    <ClInclude Include="renderer\RenderTarget9.h" />
+    <ClInclude Include="renderer\Query9.h" />
-    <ClInclude Include="renderer\RenderStateCache.h" />
+    <ClInclude Include="renderer\Renderer.h" />
-    <ClInclude Include="renderer\ShaderCache.h" />
+    <ClInclude Include="renderer\Renderer11.h" />
-    <ClInclude Include="renderer\ShaderExecutable.h" />
+    <ClInclude Include="renderer\renderer11_utils.h" />
-    <ClInclude Include="renderer\ShaderExecutable11.h" />
+    <ClInclude Include="renderer\Renderer9.h" />
-    <ClInclude Include="renderer\ShaderExecutable9.h" />
+    <ClInclude Include="renderer\renderer9_utils.h" />
-    <ClInclude Include="renderer\shaders\compiled\clear11vs.h" />
+    <ClInclude Include="renderer\RenderTarget.h" />
-    <ClInclude Include="renderer\shaders\compiled\clearmultiple11ps.h" />
+    <ClInclude Include="renderer\RenderTarget11.h" />
-    <ClInclude Include="renderer\shaders\compiled\clearsingle11ps.h" />
+    <ClInclude Include="renderer\RenderTarget9.h" />
-    <ClInclude Include="renderer\shaders\compiled\componentmaskps.h" />
+    <ClInclude Include="renderer\RenderStateCache.h" />
-    <ClInclude Include="renderer\shaders\compiled\flipyvs.h" />
+    <ClInclude Include="renderer\ShaderCache.h" />
-    <ClInclude Include="renderer\shaders\compiled\luminanceps.h" />
+    <ClInclude Include="renderer\ShaderExecutable.h" />
-    <ClInclude Include="renderer\shaders\compiled\passthrough11vs.h" />
+    <ClInclude Include="renderer\ShaderExecutable11.h" />
-    <ClInclude Include="renderer\shaders\compiled\passthroughlum11ps.h" />
+    <ClInclude Include="renderer\ShaderExecutable9.h" />
-    <ClInclude Include="renderer\shaders\compiled\passthroughlumalpha11ps.h" />
+    <ClInclude Include="renderer\shaders\compiled\clear11vs.h" />
-    <ClInclude Include="renderer\shaders\compiled\passthroughps.h" />
+    <ClInclude Include="renderer\shaders\compiled\clearmultiple11ps.h" />
-    <ClInclude Include="renderer\shaders\compiled\passthroughrgb11ps.h" />
+    <ClInclude Include="renderer\shaders\compiled\clearsingle11ps.h" />
-    <ClInclude Include="renderer\shaders\compiled\passthroughrgba11ps.h" />
+    <ClInclude Include="renderer\shaders\compiled\componentmaskps.h" />
-    <ClInclude Include="renderer\shaders\compiled\standardvs.h" />
+    <ClInclude Include="renderer\shaders\compiled\flipyvs.h" />
-    <ClInclude Include="renderer\SwapChain.h" />
+    <ClInclude Include="renderer\shaders\compiled\luminanceps.h" />
-    <ClInclude Include="renderer\SwapChain11.h" />
+    <ClInclude Include="renderer\shaders\compiled\passthrough11vs.h" />
-    <ClInclude Include="renderer\SwapChain9.h" />
+    <ClInclude Include="renderer\shaders\compiled\passthroughlum11ps.h" />
-    <ClInclude Include="renderer\TextureStorage.h" />
+    <ClInclude Include="renderer\shaders\compiled\passthroughlumalpha11ps.h" />
-    <ClInclude Include="renderer\TextureStorage11.h" />
+    <ClInclude Include="renderer\shaders\compiled\passthroughps.h" />
-    <ClInclude Include="renderer\TextureStorage9.h" />
+    <ClInclude Include="renderer\shaders\compiled\passthroughrgb11ps.h" />
-    <ClInclude Include="renderer\VertexBuffer.h" />
+    <ClInclude Include="renderer\shaders\compiled\passthroughrgba11ps.h" />
-    <ClInclude Include="renderer\VertexBuffer11.h" />
+    <ClInclude Include="renderer\shaders\compiled\standardvs.h" />
-    <ClInclude Include="renderer\VertexBuffer9.h" />
+    <ClInclude Include="renderer\SwapChain.h" />
-    <ClInclude Include="renderer\vertexconversion.h" />
+    <ClInclude Include="renderer\SwapChain11.h" />
-    <ClInclude Include="renderer\VertexDataManager.h" />
+    <ClInclude Include="renderer\SwapChain9.h" />
-    <ClInclude Include="renderer\VertexDeclarationCache.h" />
+    <ClInclude Include="renderer\TextureStorage.h" />
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="renderer\TextureStorage11.h" />
-    <ClInclude Include="ResourceManager.h" />
+    <ClInclude Include="renderer\TextureStorage9.h" />
-    <ClInclude Include="Shader.h" />
+    <ClInclude Include="renderer\VertexBuffer.h" />
-    <ClInclude Include="Texture.h" />
+    <ClInclude Include="renderer\VertexBuffer11.h" />
-    <ClInclude Include="Uniform.h" />
+    <ClInclude Include="renderer\VertexBuffer9.h" />
-    <ClInclude Include="utilities.h" />
+    <ClInclude Include="renderer\vertexconversion.h" />
-    <ClInclude Include="..\common\version.h" />
+    <ClInclude Include="renderer\VertexDataManager.h" />
-  </ItemGroup>
+    <ClInclude Include="renderer\VertexDeclarationCache.h" />
-  <ItemGroup>
+    <ClInclude Include="resource.h" />
-    <None Include="libGLESv2.def" />
+    <ClInclude Include="ResourceManager.h" />
-    <None Include="renderer\shaders\Blit.ps" />
+    <ClInclude Include="Shader.h" />
-    <None Include="renderer\shaders\Blit.vs" />
+    <ClInclude Include="Texture.h" />
-    <None Include="renderer\shaders\Clear11.hlsl" />
+    <ClInclude Include="Uniform.h" />
-    <None Include="renderer\shaders\generate_shaders.bat" />
+    <ClInclude Include="utilities.h" />
-    <None Include="renderer\shaders\Passthrough11.hlsl" />
+    <ClInclude Include="..\common\version.h" />
  </ItemGroup>
  <ItemGroup>
-    <ResourceCompile Include="libGLESv2.rc" />
+    <None Include="libGLESv2.def" />
-  </ItemGroup>
+    <None Include="renderer\shaders\Blit.ps" />
-  <ItemGroup>
+    <None Include="renderer\shaders\Blit.vs" />
-    <ProjectReference Include="..\compiler\preprocessor\preprocessor.vcxproj">
+    <None Include="renderer\shaders\Clear11.hlsl" />
-      <Project>{fbe32df3-0fb0-4f2f-a424-2c21bd7bc325}</Project>
+    <None Include="renderer\shaders\generate_shaders.bat" />
-    </ProjectReference>
+    <None Include="renderer\shaders\Passthrough11.hlsl" />
-    <ProjectReference Include="..\compiler\translator_common.vcxproj">
+  </ItemGroup>
-      <Project>{5b3a6db8-1e7e-40d7-92b9-da8aae619fad}</Project>
+  <ItemGroup>
-    </ProjectReference>
+    <ResourceCompile Include="libGLESv2.rc" />
-    <ProjectReference Include="..\compiler\translator_hlsl.vcxproj">
+  </ItemGroup>
-      <Project>{5620f0e4-6c43-49bc-a178-b804e1a0c3a7}</Project>
+  <ItemGroup>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    <ProjectReference Include="..\compiler\preprocessor\preprocessor.vcxproj">
-      <Private>true</Private>
+      <Project>{fbe32df3-0fb0-4f2f-a424-2c21bd7bc325}</Project>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+    </ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    <ProjectReference Include="..\compiler\translator_common.vcxproj">
-      <UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
+      <Project>{5b3a6db8-1e7e-40d7-92b9-da8aae619fad}</Project>
    </ProjectReference>
-  </ItemGroup>
+    <ProjectReference Include="..\compiler\translator_hlsl.vcxproj">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+      <Project>{5620f0e4-6c43-49bc-a178-b804e1a0c3a7}</Project>
-  <ImportGroup Label="ExtensionTargets">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-  </ImportGroup>
+      <Private>true</Private>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+      <UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
--- a/src/libGLESv2/libGLESv2.vcxproj.filters
+++ b/src/libGLESv2/libGLESv2.vcxproj.filters
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Source Files">
      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
    </Filter>
    <Filter Include="Header Files">
      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
    </Filter>
    <Filter Include="Third Party">
      <UniqueIdentifier>{dc1dac40-3563-41be-9e2d-c2588d8670fb}</UniqueIdentifier>
    </Filter>
    <Filter Include="Third Party\MurmurHash">
      <UniqueIdentifier>{b0005d2f-9b4a-4659-a270-138811174f73}</UniqueIdentifier>
    </Filter>
    <Filter Include="Header Files\Renderer">
      <UniqueIdentifier>{562e469d-1abb-44bc-b7fa-55eefbf75acc}</UniqueIdentifier>
    </Filter>
    <Filter Include="Shaders">
      <UniqueIdentifier>{6dc0306f-6396-4e80-9ef9-09b58aa53c4d}</UniqueIdentifier>
    </Filter>
    <Filter Include="Shaders\Compiled">
      <UniqueIdentifier>{6332705b-1999-4292-a38b-dd47329734aa}</UniqueIdentifier>
    </Filter>
    <Filter Include="Source Files\Renderer">
      <UniqueIdentifier>{93a76964-77a3-4b20-a6f5-e14e762d4e14}</UniqueIdentifier>
    </Filter>
    <Filter Include="Header Files\Renderer9">
      <UniqueIdentifier>{3877f35e-845c-4e95-b9a5-c7d8b9f307c5}</UniqueIdentifier>
    </Filter>
    <Filter Include="Header Files\Renderer11">
      <UniqueIdentifier>{2d70fd60-6dea-489f-ac09-16890d325669}</UniqueIdentifier>
    </Filter>
    <Filter Include="Source Files\Renderer9">
      <UniqueIdentifier>{60e14f04-2cf2-4a07-b3ef-7c68a82ba2d9}</UniqueIdentifier>
    </Filter>
    <Filter Include="Source Files\Renderer11">
      <UniqueIdentifier>{72db61d3-e081-4b58-bc63-a04a8a70585f}</UniqueIdentifier>
    </Filter>
-  </ItemGroup>
+    <Filter Include="Third Party\trace_event">
-  <ItemGroup>
+      <UniqueIdentifier>{ebfc1614-8f0b-48c7-b6bd-295bf91ef85c}</UniqueIdentifier>
-    <ClCompile Include="Buffer.cpp">
+    </Filter>
-      <Filter>Source Files</Filter>
+  </ItemGroup>
-    </ClCompile>
+  <ItemGroup>
-    <ClCompile Include="Context.cpp">
+    <ClCompile Include="Buffer.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\common\debug.cpp">
+    <ClCompile Include="Context.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="Fence.cpp">
+    <ClCompile Include="..\common\debug.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="Float16ToFloat32.cpp">
+    <ClCompile Include="Fence.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="Framebuffer.cpp">
+    <ClCompile Include="Float16ToFloat32.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="HandleAllocator.cpp">
+    <ClCompile Include="Framebuffer.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="libGLESv2.cpp">
+    <ClCompile Include="HandleAllocator.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="libGLESv2.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="Program.cpp">
+    <ClCompile Include="main.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="ProgramBinary.cpp">
+    <ClCompile Include="Program.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="Query.cpp">
+    <ClCompile Include="ProgramBinary.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\common\RefCountObject.cpp">
+    <ClCompile Include="Query.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="Renderbuffer.cpp">
+    <ClCompile Include="..\common\RefCountObject.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="ResourceManager.cpp">
+    <ClCompile Include="Renderbuffer.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="Shader.cpp">
+    <ClCompile Include="ResourceManager.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="Texture.cpp">
+    <ClCompile Include="Shader.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="utilities.cpp">
+    <ClCompile Include="Texture.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\Image.cpp">
+    <ClCompile Include="utilities.cpp">
-      <Filter>Source Files\Renderer</Filter>
+      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\TextureStorage.cpp">
+    <ClCompile Include="renderer\Image.cpp">
      <Filter>Source Files\Renderer</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\Renderer.cpp">
+    <ClCompile Include="renderer\TextureStorage.cpp">
      <Filter>Source Files\Renderer</Filter>
    </ClCompile>
-    <ClCompile Include="..\third_party\murmurhash\MurmurHash3.cpp">
+    <ClCompile Include="renderer\Renderer.cpp">
-      <Filter>Third Party\MurmurHash</Filter>
+      <Filter>Source Files\Renderer</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\IndexDataManager.cpp">
+    <ClCompile Include="..\third_party\murmurhash\MurmurHash3.cpp">
-      <Filter>Source Files\Renderer</Filter>
+      <Filter>Third Party\MurmurHash</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\VertexDataManager.cpp">
+    <ClCompile Include="renderer\IndexDataManager.cpp">
      <Filter>Source Files\Renderer</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\Image.cpp">
+    <ClCompile Include="renderer\VertexDataManager.cpp">
-      <Filter>Renderer</Filter>
+      <Filter>Source Files\Renderer</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\ImageSSE2.cpp">
+    <ClCompile Include="renderer\Image.cpp">
-      <Filter>Source Files\Renderer</Filter>
+      <Filter>Renderer</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\VertexBuffer.cpp">
+    <ClCompile Include="renderer\ImageSSE2.cpp">
      <Filter>Source Files\Renderer</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\IndexBuffer.cpp">
+    <ClCompile Include="renderer\VertexBuffer.cpp">
      <Filter>Source Files\Renderer</Filter>
    </ClCompile>
-    <ClCompile Include="Uniform.cpp">
+    <ClCompile Include="renderer\IndexBuffer.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Renderer</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\BufferStorage.cpp">
+    <ClCompile Include="Uniform.cpp">
-      <Filter>Source Files\Renderer</Filter>
+      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\BufferStorage11.cpp">
+    <ClCompile Include="renderer\BufferStorage.cpp">
-      <Filter>Source Files\Renderer11</Filter>
+      <Filter>Source Files\Renderer</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\Fence11.cpp">
+    <ClCompile Include="renderer\BufferStorage11.cpp">
      <Filter>Source Files\Renderer11</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\Image11.cpp">
+    <ClCompile Include="renderer\Fence11.cpp">
      <Filter>Source Files\Renderer11</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\IndexBuffer11.cpp">
+    <ClCompile Include="renderer\Image11.cpp">
      <Filter>Source Files\Renderer11</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\Query11.cpp">
+    <ClCompile Include="renderer\IndexBuffer11.cpp">
      <Filter>Source Files\Renderer11</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\Renderer11.cpp">
+    <ClCompile Include="renderer\Query11.cpp">
      <Filter>Source Files\Renderer11</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\renderer11_utils.cpp">
+    <ClCompile Include="renderer\Renderer11.cpp">
      <Filter>Source Files\Renderer11</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\RenderTarget11.cpp">
+    <ClCompile Include="renderer\renderer11_utils.cpp">
      <Filter>Source Files\Renderer11</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\ShaderExecutable11.cpp">
+    <ClCompile Include="renderer\RenderTarget11.cpp">
      <Filter>Source Files\Renderer11</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\SwapChain11.cpp">
+    <ClCompile Include="renderer\ShaderExecutable11.cpp">
      <Filter>Source Files\Renderer11</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\TextureStorage11.cpp">
+    <ClCompile Include="renderer\SwapChain11.cpp">
      <Filter>Source Files\Renderer11</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\VertexBuffer11.cpp">
+    <ClCompile Include="renderer\TextureStorage11.cpp">
      <Filter>Source Files\Renderer11</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\BufferStorage9.cpp">
+    <ClCompile Include="renderer\VertexBuffer11.cpp">
-      <Filter>Source Files\Renderer9</Filter>
+      <Filter>Source Files\Renderer11</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\Fence9.cpp">
+    <ClCompile Include="renderer\BufferStorage9.cpp">
      <Filter>Source Files\Renderer9</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\Image9.cpp">
+    <ClCompile Include="renderer\Fence9.cpp">
      <Filter>Source Files\Renderer9</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\IndexBuffer9.cpp">
+    <ClCompile Include="renderer\Image9.cpp">
      <Filter>Source Files\Renderer9</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\Query9.cpp">
+    <ClCompile Include="renderer\IndexBuffer9.cpp">
      <Filter>Source Files\Renderer9</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\Renderer9.cpp">
+    <ClCompile Include="renderer\Query9.cpp">
      <Filter>Source Files\Renderer9</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\renderer9_utils.cpp">
+    <ClCompile Include="renderer\Renderer9.cpp">
      <Filter>Source Files\Renderer9</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\RenderTarget9.cpp">
+    <ClCompile Include="renderer\renderer9_utils.cpp">
      <Filter>Source Files\Renderer9</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\ShaderExecutable9.cpp">
+    <ClCompile Include="renderer\RenderTarget9.cpp">
      <Filter>Source Files\Renderer9</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\SwapChain9.cpp">
+    <ClCompile Include="renderer\ShaderExecutable9.cpp">
      <Filter>Source Files\Renderer9</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\TextureStorage9.cpp">
+    <ClCompile Include="renderer\SwapChain9.cpp">
      <Filter>Source Files\Renderer9</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\VertexBuffer9.cpp">
+    <ClCompile Include="renderer\TextureStorage9.cpp">
      <Filter>Source Files\Renderer9</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\Blit.cpp">
+    <ClCompile Include="renderer\VertexBuffer9.cpp">
      <Filter>Source Files\Renderer9</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\InputLayoutCache.cpp">
+    <ClCompile Include="renderer\Blit.cpp">
-      <Filter>Source Files\Renderer11</Filter>
+      <Filter>Source Files\Renderer9</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\RenderStateCache.cpp">
+    <ClCompile Include="renderer\InputLayoutCache.cpp">
      <Filter>Source Files\Renderer11</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\VertexDeclarationCache.cpp">
+    <ClCompile Include="renderer\RenderStateCache.cpp">
-      <Filter>Source Files\Renderer9</Filter>
+      <Filter>Source Files\Renderer11</Filter>
    </ClCompile>
-    <ClCompile Include="precompiled.cpp">
+    <ClCompile Include="renderer\VertexDeclarationCache.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Renderer9</Filter>
    </ClCompile>
-    <ClCompile Include="renderer\IndexRangeCache.cpp">
+    <ClCompile Include="precompiled.cpp">
-      <Filter>Source Files\Renderer</Filter>
+      <Filter>Source Files</Filter>
    </ClCompile>
-  </ItemGroup>
+    <ClCompile Include="renderer\IndexRangeCache.cpp">
-  <ItemGroup>
+      <Filter>Source Files\Renderer</Filter>
-    <ClInclude Include="BinaryStream.h">
+    </ClCompile>
-      <Filter>Header Files</Filter>
+    <ClCompile Include="..\common\event_tracer.cpp">
-    </ClInclude>
+      <Filter>Source Files</Filter>
-    <ClInclude Include="Buffer.h">
+    </ClCompile>
-      <Filter>Header Files</Filter>
+  </ItemGroup>
-    </ClInclude>
+  <ItemGroup>
-    <ClInclude Include="Context.h">
+    <ClInclude Include="BinaryStream.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="Fence.h">
+    <ClInclude Include="Buffer.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="Framebuffer.h">
+    <ClInclude Include="Context.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\include\GLES2\gl2.h">
+    <ClInclude Include="Fence.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\include\GLES2\gl2ext.h">
+    <ClInclude Include="Framebuffer.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\include\GLES2\gl2platform.h">
+    <ClInclude Include="..\..\include\GLES2\gl2.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="HandleAllocator.h">
+    <ClInclude Include="..\..\include\GLES2\gl2ext.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="main.h">
+    <ClInclude Include="..\..\include\GLES2\gl2platform.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="mathutil.h">
+    <ClInclude Include="HandleAllocator.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="Program.h">
+    <ClInclude Include="main.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="ProgramBinary.h">
+    <ClInclude Include="mathutil.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="Query.h">
+    <ClInclude Include="Program.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\common\RefCountObject.h">
+    <ClInclude Include="ProgramBinary.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="Renderbuffer.h">
+    <ClInclude Include="Query.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="..\common\RefCountObject.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="ResourceManager.h">
+    <ClInclude Include="Renderbuffer.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="Shader.h">
+    <ClInclude Include="resource.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="Texture.h">
+    <ClInclude Include="ResourceManager.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="utilities.h">
+    <ClInclude Include="Shader.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\common\version.h">
+    <ClInclude Include="Texture.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="angletypes.h">
+    <ClInclude Include="utilities.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\third_party\murmurhash\MurmurHash3.h">
+    <ClInclude Include="..\common\version.h">
-      <Filter>Third Party\MurmurHash</Filter>
+      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="Uniform.h">
+    <ClInclude Include="angletypes.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\shaders\compiled\passthrough11vs.h">
+    <ClInclude Include="..\third_party\murmurhash\MurmurHash3.h">
-      <Filter>Shaders\Compiled</Filter>
+      <Filter>Third Party\MurmurHash</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\shaders\compiled\passthroughps.h">
+    <ClInclude Include="Uniform.h">
-      <Filter>Shaders\Compiled</Filter>
+      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\shaders\compiled\standardvs.h">
+    <ClInclude Include="renderer\shaders\compiled\passthrough11vs.h">
      <Filter>Shaders\Compiled</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\shaders\compiled\componentmaskps.h">
+    <ClInclude Include="renderer\shaders\compiled\passthroughps.h">
      <Filter>Shaders\Compiled</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\shaders\compiled\flipyvs.h">
+    <ClInclude Include="renderer\shaders\compiled\standardvs.h">
      <Filter>Shaders\Compiled</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\shaders\compiled\luminanceps.h">
+    <ClInclude Include="renderer\shaders\compiled\componentmaskps.h">
      <Filter>Shaders\Compiled</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\shaders\compiled\passthroughrgba11ps.h">
+    <ClInclude Include="renderer\shaders\compiled\flipyvs.h">
      <Filter>Shaders\Compiled</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\shaders\compiled\passthroughrgb11ps.h">
+    <ClInclude Include="renderer\shaders\compiled\luminanceps.h">
      <Filter>Shaders\Compiled</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\shaders\compiled\passthroughlum11ps.h">
+    <ClInclude Include="renderer\shaders\compiled\passthroughrgba11ps.h">
      <Filter>Shaders\Compiled</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\shaders\compiled\passthroughlumalpha11ps.h">
+    <ClInclude Include="renderer\shaders\compiled\passthroughrgb11ps.h">
      <Filter>Shaders\Compiled</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\shaders\compiled\clear11vs.h">
+    <ClInclude Include="renderer\shaders\compiled\passthroughlum11ps.h">
      <Filter>Shaders\Compiled</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\shaders\compiled\clearmultiple11ps.h">
+    <ClInclude Include="renderer\shaders\compiled\passthroughlumalpha11ps.h">
      <Filter>Shaders\Compiled</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\shaders\compiled\clearsingle11ps.h">
+    <ClInclude Include="renderer\shaders\compiled\clear11vs.h">
      <Filter>Shaders\Compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\common\system.h">
+    <ClInclude Include="renderer\shaders\compiled\clearmultiple11ps.h">
-      <Filter>Header Files</Filter>
+      <Filter>Shaders\Compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\common\debug.h">
+    <ClInclude Include="renderer\shaders\compiled\clearsingle11ps.h">
-      <Filter>Header Files</Filter>
+      <Filter>Shaders\Compiled</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\BufferStorage.h">
+    <ClInclude Include="..\common\system.h">
-      <Filter>Header Files\Renderer</Filter>
+      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\FenceImpl.h">
+    <ClInclude Include="..\common\debug.h">
-      <Filter>Header Files\Renderer</Filter>
+      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\generatemip.h">
+    <ClInclude Include="renderer\BufferStorage.h">
      <Filter>Header Files\Renderer</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\Image.h">
+    <ClInclude Include="renderer\FenceImpl.h">
      <Filter>Header Files\Renderer</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\IndexBuffer.h">
+    <ClInclude Include="renderer\generatemip.h">
      <Filter>Header Files\Renderer</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\IndexDataManager.h">
+    <ClInclude Include="renderer\Image.h">
      <Filter>Header Files\Renderer</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\QueryImpl.h">
+    <ClInclude Include="renderer\IndexBuffer.h">
      <Filter>Header Files\Renderer</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\Renderer.h">
+    <ClInclude Include="renderer\IndexDataManager.h">
      <Filter>Header Files\Renderer</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\RenderTarget.h">
+    <ClInclude Include="renderer\QueryImpl.h">
      <Filter>Header Files\Renderer</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\ShaderExecutable.h">
+    <ClInclude Include="renderer\Renderer.h">
      <Filter>Header Files\Renderer</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\SwapChain.h">
+    <ClInclude Include="renderer\RenderTarget.h">
      <Filter>Header Files\Renderer</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\TextureStorage.h">
+    <ClInclude Include="renderer\ShaderExecutable.h">
      <Filter>Header Files\Renderer</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\VertexBuffer.h">
+    <ClInclude Include="renderer\SwapChain.h">
      <Filter>Header Files\Renderer</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\vertexconversion.h">
+    <ClInclude Include="renderer\TextureStorage.h">
      <Filter>Header Files\Renderer</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\VertexDataManager.h">
+    <ClInclude Include="renderer\VertexBuffer.h">
      <Filter>Header Files\Renderer</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\BufferStorage11.h">
+    <ClInclude Include="renderer\vertexconversion.h">
-      <Filter>Header Files\Renderer11</Filter>
+      <Filter>Header Files\Renderer</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\IndexBuffer11.h">
+    <ClInclude Include="renderer\VertexDataManager.h">
-      <Filter>Header Files\Renderer11</Filter>
+      <Filter>Header Files\Renderer</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\Query11.h">
+    <ClInclude Include="renderer\BufferStorage11.h">
      <Filter>Header Files\Renderer11</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\Renderer11.h">
+    <ClInclude Include="renderer\IndexBuffer11.h">
      <Filter>Header Files\Renderer11</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\RenderTarget11.h">
+    <ClInclude Include="renderer\Query11.h">
      <Filter>Header Files\Renderer11</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\ShaderExecutable11.h">
+    <ClInclude Include="renderer\Renderer11.h">
      <Filter>Header Files\Renderer11</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\SwapChain11.h">
+    <ClInclude Include="renderer\RenderTarget11.h">
      <Filter>Header Files\Renderer11</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\TextureStorage11.h">
+    <ClInclude Include="renderer\ShaderExecutable11.h">
      <Filter>Header Files\Renderer11</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\VertexBuffer11.h">
+    <ClInclude Include="renderer\SwapChain11.h">
      <Filter>Header Files\Renderer11</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\BufferStorage9.h">
+    <ClInclude Include="renderer\TextureStorage11.h">
-      <Filter>Header Files\Renderer9</Filter>
+      <Filter>Header Files\Renderer11</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\Fence9.h">
+    <ClInclude Include="renderer\VertexBuffer11.h">
-      <Filter>Header Files\Renderer9</Filter>
+      <Filter>Header Files\Renderer11</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\Image9.h">
+    <ClInclude Include="renderer\BufferStorage9.h">
      <Filter>Header Files\Renderer9</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\IndexBuffer9.h">
+    <ClInclude Include="renderer\Fence9.h">
      <Filter>Header Files\Renderer9</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\Query9.h">
+    <ClInclude Include="renderer\Image9.h">
      <Filter>Header Files\Renderer9</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\Renderer9.h">
+    <ClInclude Include="renderer\IndexBuffer9.h">
      <Filter>Header Files\Renderer9</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\renderer9_utils.h">
+    <ClInclude Include="renderer\Query9.h">
      <Filter>Header Files\Renderer9</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\RenderTarget9.h">
+    <ClInclude Include="renderer\Renderer9.h">
      <Filter>Header Files\Renderer9</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\ShaderExecutable9.h">
+    <ClInclude Include="renderer\renderer9_utils.h">
      <Filter>Header Files\Renderer9</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\SwapChain9.h">
+    <ClInclude Include="renderer\RenderTarget9.h">
      <Filter>Header Files\Renderer9</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\TextureStorage9.h">
+    <ClInclude Include="renderer\ShaderExecutable9.h">
      <Filter>Header Files\Renderer9</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\VertexBuffer9.h">
+    <ClInclude Include="renderer\SwapChain9.h">
      <Filter>Header Files\Renderer9</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\Fence11.h">
+    <ClInclude Include="renderer\TextureStorage9.h">
-      <Filter>Header Files\Renderer11</Filter>
+      <Filter>Header Files\Renderer9</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\Image11.h">
+    <ClInclude Include="renderer\VertexBuffer9.h">
-      <Filter>Header Files\Renderer11</Filter>
+      <Filter>Header Files\Renderer9</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\renderer11_utils.h">
+    <ClInclude Include="renderer\Fence11.h">
      <Filter>Header Files\Renderer11</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\Fence9.h">
+    <ClInclude Include="renderer\Image11.h">
-      <Filter>Header Files\Renderer\Renderer9</Filter>
+      <Filter>Header Files\Renderer11</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\Query11.h">
+    <ClInclude Include="renderer\renderer11_utils.h">
-      <Filter>Header Files\Renderer\Renderer11</Filter>
+      <Filter>Header Files\Renderer11</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\Blit.h">
+    <ClInclude Include="renderer\Fence9.h">
-      <Filter>Header Files\Renderer9</Filter>
+      <Filter>Header Files\Renderer\Renderer9</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\ShaderCache.h">
+    <ClInclude Include="renderer\Query11.h">
-      <Filter>Header Files\Renderer9</Filter>
+      <Filter>Header Files\Renderer\Renderer11</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\InputLayoutCache.h">
+    <ClInclude Include="renderer\Blit.h">
-      <Filter>Header Files\Renderer11</Filter>
+      <Filter>Header Files\Renderer9</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\RenderStateCache.h">
+    <ClInclude Include="renderer\ShaderCache.h">
-      <Filter>Header Files\Renderer11</Filter>
+      <Filter>Header Files\Renderer9</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\VertexDeclarationCache.h">
+    <ClInclude Include="renderer\InputLayoutCache.h">
-      <Filter>Header Files\Renderer9</Filter>
+      <Filter>Header Files\Renderer11</Filter>
    </ClInclude>
-    <ClInclude Include="constants.h">
+    <ClInclude Include="renderer\RenderStateCache.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files\Renderer11</Filter>
    </ClInclude>
-    <ClInclude Include="precompiled.h">
+    <ClInclude Include="renderer\VertexDeclarationCache.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files\Renderer9</Filter>
    </ClInclude>
-    <ClInclude Include="renderer\IndexRangeCache.h">
+    <ClInclude Include="constants.h">
-      <Filter>Header Files\Renderer</Filter>
+      <Filter>Header Files</Filter>
    </ClInclude>
-  </ItemGroup>
+    <ClInclude Include="precompiled.h">
-  <ItemGroup>
+      <Filter>Header Files</Filter>
-    <None Include="renderer\shaders\Blit.ps">
+    </ClInclude>
-      <Filter>Shaders</Filter>
+    <ClInclude Include="renderer\IndexRangeCache.h">
-    </None>
+      <Filter>Header Files\Renderer</Filter>
-    <None Include="renderer\shaders\Blit.vs">
+    </ClInclude>
-      <Filter>Shaders</Filter>
+    <ClInclude Include="..\common\event_tracer.h">
-    </None>
+      <Filter>Header Files</Filter>
-    <None Include="renderer\shaders\generate_shaders.bat">
+    </ClInclude>
-      <Filter>Shaders</Filter>
+    <ClInclude Include="..\third_party\trace_event\trace_event.h">
-    </None>
+      <Filter>Third Party\trace_event</Filter>
-    <None Include="renderer\shaders\Passthrough11.hlsl">
+    </ClInclude>
-      <Filter>Shaders</Filter>
+  </ItemGroup>
-    </None>
+  <ItemGroup>
-    <None Include="renderer\shaders\Clear11.hlsl">
+    <None Include="renderer\shaders\Blit.ps">
      <Filter>Shaders</Filter>
    </None>
-    <None Include="libGLESv2.def" />
+    <None Include="renderer\shaders\Blit.vs">
-  </ItemGroup>
+      <Filter>Shaders</Filter>
-  <ItemGroup>
+    </None>
-    <ResourceCompile Include="libGLESv2.rc" />
+    <None Include="renderer\shaders\generate_shaders.bat">
-  </ItemGroup>
+      <Filter>Shaders</Filter>
+    </None>
+    <None Include="renderer\shaders\Passthrough11.hlsl">
+      <Filter>Shaders</Filter>
+    </None>
+    <None Include="renderer\shaders\Clear11.hlsl">
+      <Filter>Shaders</Filter>
+    </None>
+    <None Include="libGLESv2.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="libGLESv2.rc" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
--- a/src/libGLESv2/renderer/Renderer.cpp
+++ b/src/libGLESv2/renderer/Renderer.cpp
@@ -14,6 +14,7 @@
 #include "libGLESv2/renderer/Renderer9.h"
 #include "libGLESv2/renderer/Renderer11.h"
 #include "libGLESv2/utilities.h"
+#include "third_party/trace_event/trace_event.h"
 #if !defined(ANGLE_ENABLE_D3D11)
 // Enables use of the Direct3D 11 API for a default display, when available
@@ -40,6 +41,7 @@ Renderer::~Renderer()
 bool Renderer::initializeCompiler()
 {
+    TRACE_EVENT0("gpu", "initializeCompiler");
 #if defined(ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES)
    // Find a D3DCompiler module that had already been loaded based on a predefined list of versions.
    static TCHAR* d3dCompilerNames[] = ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES;

--- a/src/libGLESv2/renderer/Renderer9.cpp
+++ b/src/libGLESv2/renderer/Renderer9.cpp
@@ -30,6 +30,8 @@
 #include "libEGL/Display.h"
+#include "third_party/trace_event/trace_event.h"
 // Can also be enabled by defining FORCE_REF_RAST in the project's predefined macros
 #define REF_RAST 0
@@ -184,10 +186,12 @@ EGLint Renderer9::initialize()
    if (mSoftwareDevice)
    {
+        TRACE_EVENT0("gpu", "GetModuleHandle_swiftshader");
        mD3d9Module = GetModuleHandle(TEXT("swiftshader_d3d9.dll"));
    }
    else
    {
+        TRACE_EVENT0("gpu", "GetModuleHandle_d3d9");
        mD3d9Module = GetModuleHandle(TEXT("d3d9.dll"));
    }
@@ -205,12 +209,14 @@ EGLint Renderer9::initialize()
    // desktop. Direct3D9Ex is available in Windows Vista and later if suitable drivers are available.
    if (ANGLE_ENABLE_D3D9EX && Direct3DCreate9ExPtr && SUCCEEDED(Direct3DCreate9ExPtr(D3D_SDK_VERSION, &mD3d9Ex)))
    {
+        TRACE_EVENT0("gpu", "D3d9Ex_QueryInterface");
        ASSERT(mD3d9Ex);
        mD3d9Ex->QueryInterface(IID_IDirect3D9, reinterpret_cast<void**>(&mD3d9));
        ASSERT(mD3d9);
    }
    else
    {
+        TRACE_EVENT0("gpu", "Direct3DCreate9");
        mD3d9 = Direct3DCreate9(D3D_SDK_VERSION);
    }
@@ -228,21 +234,24 @@ EGLint Renderer9::initialize()
    HRESULT result;
    // Give up on getting device caps after about one second.
-    for (int i = 0; i < 10; ++i)
    {
-        result = mD3d9->GetDeviceCaps(mAdapter, mDeviceType, &mDeviceCaps);
+        TRACE_EVENT0("gpu", "GetDeviceCaps");
-        if (SUCCEEDED(result))
+        for (int i = 0; i < 10; ++i)
-        {
-            break;
-        }
-        else if (result == D3DERR_NOTAVAILABLE)
-        {
-            Sleep(100);   // Give the driver some time to initialize/recover
-        }
-        else if (FAILED(result))   // D3DERR_OUTOFVIDEOMEMORY, E_OUTOFMEMORY, D3DERR_INVALIDDEVICE, or another error we can't recover from
        {
-            ERR("failed to get device caps (0x%x)\n", result);
+            result = mD3d9->GetDeviceCaps(mAdapter, mDeviceType, &mDeviceCaps);
-            return EGL_NOT_INITIALIZED;
+            if (SUCCEEDED(result))
+            {
+                break;
+            }
+            else if (result == D3DERR_NOTAVAILABLE)
+            {
+                Sleep(100);   // Give the driver some time to initialize/recover
+            }
+            else if (FAILED(result))   // D3DERR_OUTOFVIDEOMEMORY, E_OUTOFMEMORY, D3DERR_INVALIDDEVICE, or another error we can't recover from
+            {
+                ERR("failed to get device caps (0x%x)\n", result);
+                return EGL_NOT_INITIALIZED;
+            }
        }
    }
@@ -260,7 +269,10 @@ EGLint Renderer9::initialize()
        return EGL_NOT_INITIALIZED;
    }
-    mD3d9->GetAdapterIdentifier(mAdapter, 0, &mAdapterIdentifier);
+    {
+        TRACE_EVENT0("gpu", "GetAdapterIdentifier");
+        mD3d9->GetAdapterIdentifier(mAdapter, 0, &mAdapterIdentifier);
+    }
    // ATI cards on XP have problems with non-power-of-two textures.
    mSupportsNonPower2Textures = !(mDeviceCaps.TextureCaps & D3DPTEXTURECAPS_POW2) &&
@@ -301,35 +313,41 @@ EGLint Renderer9::initialize()
    }
    int max = 0;
-    for (unsigned int i = 0; i < ArraySize(RenderTargetFormats); ++i)
    {
-        bool *multisampleArray = new bool[D3DMULTISAMPLE_16_SAMPLES + 1];
+        TRACE_EVENT0("gpu", "getMultiSampleSupport");
-        getMultiSampleSupport(RenderTargetFormats[i], multisampleArray);
+        for (unsigned int i = 0; i < ArraySize(RenderTargetFormats); ++i)
-        mMultiSampleSupport[RenderTargetFormats[i]] = multisampleArray;
-        for (int j = D3DMULTISAMPLE_16_SAMPLES; j >= 0; --j)
        {
-            if (multisampleArray[j] && j != D3DMULTISAMPLE_NONMASKABLE && j > max)
+            bool *multisampleArray = new bool[D3DMULTISAMPLE_16_SAMPLES + 1];
+            getMultiSampleSupport(RenderTargetFormats[i], multisampleArray);
+            mMultiSampleSupport[RenderTargetFormats[i]] = multisampleArray;
+            for (int j = D3DMULTISAMPLE_16_SAMPLES; j >= 0; --j)
            {
-                max = j;
+                if (multisampleArray[j] && j != D3DMULTISAMPLE_NONMASKABLE && j > max)
+                {
+                    max = j;
+                }
            }
        }
    }
-    for (unsigned int i = 0; i < ArraySize(DepthStencilFormats); ++i)
    {
-        if (DepthStencilFormats[i] == D3DFMT_UNKNOWN)
+        TRACE_EVENT0("gpu", "getMultiSampleSupport2");
-            continue;
+        for (unsigned int i = 0; i < ArraySize(DepthStencilFormats); ++i)
+        {
+            if (DepthStencilFormats[i] == D3DFMT_UNKNOWN)
+                continue;
-        bool *multisampleArray = new bool[D3DMULTISAMPLE_16_SAMPLES + 1];
+            bool *multisampleArray = new bool[D3DMULTISAMPLE_16_SAMPLES + 1];
-        getMultiSampleSupport(DepthStencilFormats[i], multisampleArray);
+            getMultiSampleSupport(DepthStencilFormats[i], multisampleArray);
-        mMultiSampleSupport[DepthStencilFormats[i]] = multisampleArray;
+            mMultiSampleSupport[DepthStencilFormats[i]] = multisampleArray;
-        for (int j = D3DMULTISAMPLE_16_SAMPLES; j >= 0; --j)
+            for (int j = D3DMULTISAMPLE_16_SAMPLES; j >= 0; --j)
-        {
-            if (multisampleArray[j] && j != D3DMULTISAMPLE_NONMASKABLE && j > max)
            {
-                max = j;
+                if (multisampleArray[j] && j != D3DMULTISAMPLE_NONMASKABLE && j > max)
+                {
+                    max = j;
+                }
            }
        }
    }
@@ -339,12 +357,18 @@ EGLint Renderer9::initialize()
    static const TCHAR windowName[] = TEXT("AngleHiddenWindow");
    static const TCHAR className[] = TEXT("STATIC");
-    mDeviceWindow = CreateWindowEx(WS_EX_NOACTIVATE, className, windowName, WS_DISABLED | WS_POPUP, 0, 0, 1, 1, HWND_MESSAGE, NULL, GetModuleHandle(NULL), NULL);
+    {
+        TRACE_EVENT0("gpu", "CreateWindowEx");
+        mDeviceWindow = CreateWindowEx(WS_EX_NOACTIVATE, className, windowName, WS_DISABLED | WS_POPUP, 0, 0, 1, 1, HWND_MESSAGE, NULL, GetModuleHandle(NULL), NULL);
+    }
    D3DPRESENT_PARAMETERS presentParameters = getDefaultPresentParameters();
    DWORD behaviorFlags = D3DCREATE_FPU_PRESERVE | D3DCREATE_NOWINDOWCHANGES;
-    result = mD3d9->CreateDevice(mAdapter, mDeviceType, mDeviceWindow, behaviorFlags | D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &presentParameters, &mDevice);
+    {
+        TRACE_EVENT0("gpu", "D3d9_CreateDevice");
+        result = mD3d9->CreateDevice(mAdapter, mDeviceType, mDeviceWindow, behaviorFlags | D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &presentParameters, &mDevice);
+    }
    if (result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY || result == D3DERR_DEVICELOST)
    {
        return EGL_BAD_ALLOC;
@@ -352,6 +376,7 @@ EGLint Renderer9::initialize()
    if (FAILED(result))
    {
+        TRACE_EVENT0("gpu", "D3d9_CreateDevice2");
        result = mD3d9->CreateDevice(mAdapter, mDeviceType, mDeviceWindow, behaviorFlags | D3DCREATE_SOFTWARE_VERTEXPROCESSING, &presentParameters, &mDevice);
        if (FAILED(result))
@@ -363,35 +388,45 @@ EGLint Renderer9::initialize()
    if (mD3d9Ex)
    {
+        TRACE_EVENT0("gpu", "mDevice_QueryInterface");
        result = mDevice->QueryInterface(IID_IDirect3DDevice9Ex, (void**) &mDeviceEx);
        ASSERT(SUCCEEDED(result));
    }
-    mVertexShaderCache.initialize(mDevice);
+    {
-    mPixelShaderCache.initialize(mDevice);
+        TRACE_EVENT0("gpu", "ShaderCache initialize");
+        mVertexShaderCache.initialize(mDevice);
+        mPixelShaderCache.initialize(mDevice);
+    }
    // Check occlusion query support
    IDirect3DQuery9 *occlusionQuery = NULL;
-    if (SUCCEEDED(mDevice->CreateQuery(D3DQUERYTYPE_OCCLUSION, &occlusionQuery)) && occlusionQuery)
-    {
-        occlusionQuery->Release();
-        mOcclusionQuerySupport = true;
-    }
-    else
    {
-        mOcclusionQuerySupport = false;
+        TRACE_EVENT0("gpu", "device_CreateQuery");
+        if (SUCCEEDED(mDevice->CreateQuery(D3DQUERYTYPE_OCCLUSION, &occlusionQuery)) && occlusionQuery)
+        {
+            occlusionQuery->Release();
+            mOcclusionQuerySupport = true;
+        }
+        else
+        {
+            mOcclusionQuerySupport = false;
+        }
    }
    // Check event query support
    IDirect3DQuery9 *eventQuery = NULL;
-    if (SUCCEEDED(mDevice->CreateQuery(D3DQUERYTYPE_EVENT, &eventQuery)) && eventQuery)
-    {
-        eventQuery->Release();
-        mEventQuerySupport = true;
-    }
-    else
    {
-        mEventQuerySupport = false;
+        TRACE_EVENT0("gpu", "device_CreateQuery2");
+        if (SUCCEEDED(mDevice->CreateQuery(D3DQUERYTYPE_EVENT, &eventQuery)) && eventQuery)
+        {
+            eventQuery->Release();
+            mEventQuerySupport = true;
+        }
+        else
+        {
+            mEventQuerySupport = false;
+        }
    }
    D3DDISPLAYMODE currentDisplayMode;

--- a/src/third_party/trace_event/trace_event.h
+++ b/src/third_party/trace_event/trace_event.h
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+// Trace events are for tracking application performance and resource usage.
+// Macros are provided to track:
+//    Begin and end of function calls
+//    Counters
+//
+// Events are issued against categories. Whereas LOG's
+// categories are statically defined, TRACE categories are created
+// implicitly with a string. For example:
+//   TRACE_EVENT_INSTANT0("MY_SUBSYSTEM", "SomeImportantEvent")
+//
+// Events can be INSTANT, or can be pairs of BEGIN and END in the same scope:
+//   TRACE_EVENT_BEGIN0("MY_SUBSYSTEM", "SomethingCostly")
+//   doSomethingCostly()
+//   TRACE_EVENT_END0("MY_SUBSYSTEM", "SomethingCostly")
+// Note: our tools can't always determine the correct BEGIN/END pairs unless
+// these are used in the same scope. Use ASYNC_BEGIN/ASYNC_END macros if you need them
+// to be in separate scopes.
+//
+// A common use case is to trace entire function scopes. This
+// issues a trace BEGIN and END automatically:
+//   void doSomethingCostly() {
+//     TRACE_EVENT0("MY_SUBSYSTEM", "doSomethingCostly");
+//     ...
+//   }
+//
+// Additional parameters can be associated with an event:
+//   void doSomethingCostly2(int howMuch) {
+//     TRACE_EVENT1("MY_SUBSYSTEM", "doSomethingCostly",
+//         "howMuch", howMuch);
+//     ...
+//   }
+//
+// The trace system will automatically add to this information the
+// current process id, thread id, and a timestamp in microseconds.
+//
+// To trace an asynchronous procedure such as an IPC send/receive, use ASYNC_BEGIN and
+// ASYNC_END:
+//   [single threaded sender code]
+//     static int send_count = 0;
+//     ++send_count;
+//     TRACE_EVENT_ASYNC_BEGIN0("ipc", "message", send_count);
+//     Send(new MyMessage(send_count));
+//   [receive code]
+//     void OnMyMessage(send_count) {
+//       TRACE_EVENT_ASYNC_END0("ipc", "message", send_count);
+//     }
+// The third parameter is a unique ID to match ASYNC_BEGIN/ASYNC_END pairs.
+// ASYNC_BEGIN and ASYNC_END can occur on any thread of any traced process. Pointers can
+// be used for the ID parameter, and they will be mangled internally so that
+// the same pointer on two different processes will not match. For example:
+//   class MyTracedClass {
+//    public:
+//     MyTracedClass() {
+//       TRACE_EVENT_ASYNC_BEGIN0("category", "MyTracedClass", this);
+//     }
+//     ~MyTracedClass() {
+//       TRACE_EVENT_ASYNC_END0("category", "MyTracedClass", this);
+//     }
+//   }
+//
+// Trace event also supports counters, which is a way to track a quantity
+// as it varies over time. Counters are created with the following macro:
+//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter", g_myCounterValue);
+//
+// Counters are process-specific. The macro itself can be issued from any
+// thread, however.
+//
+// Sometimes, you want to track two counters at once. You can do this with two
+// counter macros:
+//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter0", g_myCounterValue[0]);
+//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter1", g_myCounterValue[1]);
+// Or you can do it with a combined macro:
+//   TRACE_COUNTER2("MY_SUBSYSTEM", "myCounter",
+//       "bytesPinned", g_myCounterValue[0],
+//       "bytesAllocated", g_myCounterValue[1]);
+// This indicates to the tracing UI that these counters should be displayed
+// in a single graph, as a summed area chart.
+//
+// Since counters are in a global namespace, you may want to disembiguate with a
+// unique ID, by using the TRACE_COUNTER_ID* variations.
+//
+// By default, trace collection is compiled in, but turned off at runtime.
+// Collecting trace data is the responsibility of the embedding
+// application. In Chrome's case, navigating to about:tracing will turn on
+// tracing and display data collected across all active processes.
+//
+//
+// Memory scoping note:
+// Tracing copies the pointers, not the string content, of the strings passed
+// in for category, name, and arg_names. Thus, the following code will
+// cause problems:
+//     char* str = strdup("impprtantName");
+//     TRACE_EVENT_INSTANT0("SUBSYSTEM", str);  // BAD!
+//     free(str);                   // Trace system now has dangling pointer
+//
+// To avoid this issue with the |name| and |arg_name| parameters, use the
+// TRACE_EVENT_COPY_XXX overloads of the macros at additional runtime overhead.
+// Notes: The category must always be in a long-lived char* (i.e. static const).
+//        The |arg_values|, when used, are always deep copied with the _COPY
+//        macros.
+//
+// When are string argument values copied:
+// const char* arg_values are only referenced by default:
+//     TRACE_EVENT1("category", "name",
+//                  "arg1", "literal string is only referenced");
+// Use TRACE_STR_COPY to force copying of a const char*:
+//     TRACE_EVENT1("category", "name",
+//                  "arg1", TRACE_STR_COPY("string will be copied"));
+// std::string arg_values are always copied:
+//     TRACE_EVENT1("category", "name",
+//                  "arg1", std::string("string will be copied"));
+//
+//
+// Thread Safety:
+// A thread safe singleton and mutex are used for thread safety. Category
+// enabled flags are used to limit the performance impact when the system
+// is not enabled.
+//
+// TRACE_EVENT macros first cache a pointer to a category. The categories are
+// statically allocated and safe at all times, even after exit. Fetching a
+// category is protected by the TraceLog::lock_. Multiple threads initializing
+// the static variable is safe, as they will be serialized by the lock and
+// multiple calls will return the same pointer to the category.
+//
+// Then the category_enabled flag is checked. This is a unsigned char, and
+// not intended to be multithread safe. It optimizes access to addTraceEvent
+// which is threadsafe internally via TraceLog::lock_. The enabled flag may
+// cause some threads to incorrectly call or skip calling addTraceEvent near
+// the time of the system being enabled or disabled. This is acceptable as
+// we tolerate some data loss while the system is being enabled/disabled and
+// because addTraceEvent is threadsafe internally and checks the enabled state
+// again under lock.
+//
+// Without the use of these static category pointers and enabled flags all
+// trace points would carry a significant performance cost of aquiring a lock
+// and resolving the category.
+#ifndef COMMON_TRACE_EVENT_H_
+#define COMMON_TRACE_EVENT_H_
+#include <string>
+#include "common/event_tracer.h"
+// By default, const char* argument values are assumed to have long-lived scope
+// and will not be copied. Use this macro to force a const char* to be copied.
+#define TRACE_STR_COPY(str) \
+    WebCore::TraceEvent::TraceStringWithCopy(str)
+// Records a pair of begin and end events called "name" for the current
+// scope, with 0, 1 or 2 associated arguments. If the category is not
+// enabled, then this does nothing.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+#define TRACE_EVENT0(category, name) \
+    INTERNAL_TRACE_EVENT_ADD_SCOPED(category, name)
+#define TRACE_EVENT1(category, name, arg1_name, arg1_val) \
+    INTERNAL_TRACE_EVENT_ADD_SCOPED(category, name, arg1_name, arg1_val)
+#define TRACE_EVENT2(category, name, arg1_name, arg1_val, arg2_name, arg2_val) \
+    INTERNAL_TRACE_EVENT_ADD_SCOPED(category, name, arg1_name, arg1_val, \
+        arg2_name, arg2_val)
+// Records a single event called "name" immediately, with 0, 1 or 2
+// associated arguments. If the category is not enabled, then this
+// does nothing.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+#define TRACE_EVENT_INSTANT0(category, name) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
+        category, name, TRACE_EVENT_FLAG_NONE)
+#define TRACE_EVENT_INSTANT1(category, name, arg1_name, arg1_val) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
+        category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
+#define TRACE_EVENT_INSTANT2(category, name, arg1_name, arg1_val, \
+        arg2_name, arg2_val) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
+        category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, \
+        arg2_name, arg2_val)
+#define TRACE_EVENT_COPY_INSTANT0(category, name) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
+        category, name, TRACE_EVENT_FLAG_COPY)
+#define TRACE_EVENT_COPY_INSTANT1(category, name, arg1_name, arg1_val) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
+        category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val)
+#define TRACE_EVENT_COPY_INSTANT2(category, name, arg1_name, arg1_val, \
+        arg2_name, arg2_val) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
+        category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, \
+        arg2_name, arg2_val)
+// Records a single BEGIN event called "name" immediately, with 0, 1 or 2
+// associated arguments. If the category is not enabled, then this
+// does nothing.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+#define TRACE_EVENT_BEGIN0(category, name) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
+        category, name, TRACE_EVENT_FLAG_NONE)
+#define TRACE_EVENT_BEGIN1(category, name, arg1_name, arg1_val) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
+        category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
+#define TRACE_EVENT_BEGIN2(category, name, arg1_name, arg1_val, \
+        arg2_name, arg2_val) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
+        category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, \
+        arg2_name, arg2_val)
+#define TRACE_EVENT_COPY_BEGIN0(category, name) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
+        category, name, TRACE_EVENT_FLAG_COPY)
+#define TRACE_EVENT_COPY_BEGIN1(category, name, arg1_name, arg1_val) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
+        category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val)
+#define TRACE_EVENT_COPY_BEGIN2(category, name, arg1_name, arg1_val, \
+        arg2_name, arg2_val) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
+        category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, \
+        arg2_name, arg2_val)
+// Records a single END event for "name" immediately. If the category
+// is not enabled, then this does nothing.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+#define TRACE_EVENT_END0(category, name) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
+        category, name, TRACE_EVENT_FLAG_NONE)
+#define TRACE_EVENT_END1(category, name, arg1_name, arg1_val) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
+        category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
+#define TRACE_EVENT_END2(category, name, arg1_name, arg1_val, \
+        arg2_name, arg2_val) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
+        category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, \
+        arg2_name, arg2_val)
+#define TRACE_EVENT_COPY_END0(category, name) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
+        category, name, TRACE_EVENT_FLAG_COPY)
+#define TRACE_EVENT_COPY_END1(category, name, arg1_name, arg1_val) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
+        category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val)
+#define TRACE_EVENT_COPY_END2(category, name, arg1_name, arg1_val, \
+        arg2_name, arg2_val) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
+        category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, \
+        arg2_name, arg2_val)
+// Records the value of a counter called "name" immediately. Value
+// must be representable as a 32 bit integer.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+#define TRACE_COUNTER1(category, name, value) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, \
+        category, name, TRACE_EVENT_FLAG_NONE, \
+        "value", static_cast<int>(value))
+#define TRACE_COPY_COUNTER1(category, name, value) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, \
+        category, name, TRACE_EVENT_FLAG_COPY, \
+        "value", static_cast<int>(value))
+// Records the values of a multi-parted counter called "name" immediately.
+// The UI will treat value1 and value2 as parts of a whole, displaying their
+// values as a stacked-bar chart.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+#define TRACE_COUNTER2(category, name, value1_name, value1_val, \
+        value2_name, value2_val) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, \
+        category, name, TRACE_EVENT_FLAG_NONE, \
+        value1_name, static_cast<int>(value1_val), \
+        value2_name, static_cast<int>(value2_val))
+#define TRACE_COPY_COUNTER2(category, name, value1_name, value1_val, \
+        value2_name, value2_val) \
+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, \
+        category, name, TRACE_EVENT_FLAG_COPY, \
+        value1_name, static_cast<int>(value1_val), \
+        value2_name, static_cast<int>(value2_val))
+// Records the value of a counter called "name" immediately. Value
+// must be representable as a 32 bit integer.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+// - |id| is used to disambiguate counters with the same name. It must either
+//   be a pointer or an integer value up to 64 bits. If it's a pointer, the bits
+//   will be xored with a hash of the process ID so that the same pointer on
+//   two different processes will not collide.
+#define TRACE_COUNTER_ID1(category, name, id, value) \
+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, \
+        category, name, id, TRACE_EVENT_FLAG_NONE, \
+        "value", static_cast<int>(value))
+#define TRACE_COPY_COUNTER_ID1(category, name, id, value) \
+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, \
+        category, name, id, TRACE_EVENT_FLAG_COPY, \
+        "value", static_cast<int>(value))
+// Records the values of a multi-parted counter called "name" immediately.
+// The UI will treat value1 and value2 as parts of a whole, displaying their
+// values as a stacked-bar chart.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+// - |id| is used to disambiguate counters with the same name. It must either
+//   be a pointer or an integer value up to 64 bits. If it's a pointer, the bits
+//   will be xored with a hash of the process ID so that the same pointer on
+//   two different processes will not collide.
+#define TRACE_COUNTER_ID2(category, name, id, value1_name, value1_val, \
+        value2_name, value2_val) \
+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, \
+        category, name, id, TRACE_EVENT_FLAG_NONE, \
+        value1_name, static_cast<int>(value1_val), \
+        value2_name, static_cast<int>(value2_val))
+#define TRACE_COPY_COUNTER_ID2(category, name, id, value1_name, value1_val, \
+        value2_name, value2_val) \
+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, \
+        category, name, id, TRACE_EVENT_FLAG_COPY, \
+        value1_name, static_cast<int>(value1_val), \
+        value2_name, static_cast<int>(value2_val))
+// Records a single ASYNC_BEGIN event called "name" immediately, with 0, 1 or 2
+// associated arguments. If the category is not enabled, then this
+// does nothing.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+// - |id| is used to match the ASYNC_BEGIN event with the ASYNC_END event. ASYNC
+//   events are considered to match if their category, name and id values all
+//   match. |id| must either be a pointer or an integer value up to 64 bits. If
+//   it's a pointer, the bits will be xored with a hash of the process ID so
+//   that the same pointer on two different processes will not collide.
+// An asynchronous operation can consist of multiple phases. The first phase is
+// defined by the ASYNC_BEGIN calls. Additional phases can be defined using the
+// ASYNC_STEP_BEGIN macros. When the operation completes, call ASYNC_END.
+// An async operation can span threads and processes, but all events in that
+// operation must use the same |name| and |id|. Each event can have its own
+// args.
+#define TRACE_EVENT_ASYNC_BEGIN0(category, name, id) \
+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
+        category, name, id, TRACE_EVENT_FLAG_NONE)
+#define TRACE_EVENT_ASYNC_BEGIN1(category, name, id, arg1_name, arg1_val) \
+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
+        category, name, id, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
+#define TRACE_EVENT_ASYNC_BEGIN2(category, name, id, arg1_name, arg1_val, \
+        arg2_name, arg2_val) \
+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
+        category, name, id, TRACE_EVENT_FLAG_NONE, \
+        arg1_name, arg1_val, arg2_name, arg2_val)
+#define TRACE_EVENT_COPY_ASYNC_BEGIN0(category, name, id) \
+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
+        category, name, id, TRACE_EVENT_FLAG_COPY)
+#define TRACE_EVENT_COPY_ASYNC_BEGIN1(category, name, id, arg1_name, arg1_val) \
+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
+        category, name, id, TRACE_EVENT_FLAG_COPY, \
+        arg1_name, arg1_val)
+#define TRACE_EVENT_COPY_ASYNC_BEGIN2(category, name, id, arg1_name, arg1_val, \
+        arg2_name, arg2_val) \
+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
+        category, name, id, TRACE_EVENT_FLAG_COPY, \
+        arg1_name, arg1_val, arg2_name, arg2_val)
+// Records a single ASYNC_STEP event for |step| immediately. If the category
+// is not enabled, then this does nothing. The |name| and |id| must match the
+// ASYNC_BEGIN event above. The |step| param identifies this step within the
+// async event. This should be called at the beginning of the next phase of an
+// asynchronous operation.
+#define TRACE_EVENT_ASYNC_STEP0(category, name, id, step) \
+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, \
+        category, name, id, TRACE_EVENT_FLAG_NONE, "step", step)
+#define TRACE_EVENT_ASYNC_STEP1(category, name, id, step, \
+                                      arg1_name, arg1_val) \
+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, \
+        category, name, id, TRACE_EVENT_FLAG_NONE, "step", step, \
+        arg1_name, arg1_val)
+#define TRACE_EVENT_COPY_ASYNC_STEP0(category, name, id, step) \
+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, \
+        category, name, id, TRACE_EVENT_FLAG_COPY, "step", step)
+#define TRACE_EVENT_COPY_ASYNC_STEP1(category, name, id, step, \
+        arg1_name, arg1_val) \
+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, \
+        category, name, id, TRACE_EVENT_FLAG_COPY, "step", step, \
+        arg1_name, arg1_val)
+// Records a single ASYNC_END event for "name" immediately. If the category
+// is not enabled, then this does nothing.
+#define TRACE_EVENT_ASYNC_END0(category, name, id) \
+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
+        category, name, id, TRACE_EVENT_FLAG_NONE)
+#define TRACE_EVENT_ASYNC_END1(category, name, id, arg1_name, arg1_val) \
+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
+        category, name, id, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
+#define TRACE_EVENT_ASYNC_END2(category, name, id, arg1_name, arg1_val, \
+        arg2_name, arg2_val) \
+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
+        category, name, id, TRACE_EVENT_FLAG_NONE, \
+        arg1_name, arg1_val, arg2_name, arg2_val)
+#define TRACE_EVENT_COPY_ASYNC_END0(category, name, id) \
+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
+        category, name, id, TRACE_EVENT_FLAG_COPY)
+#define TRACE_EVENT_COPY_ASYNC_END1(category, name, id, arg1_name, arg1_val) \
+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
+        category, name, id, TRACE_EVENT_FLAG_COPY, \
+        arg1_name, arg1_val)
+#define TRACE_EVENT_COPY_ASYNC_END2(category, name, id, arg1_name, arg1_val, \
+        arg2_name, arg2_val) \
+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
+        category, name, id, TRACE_EVENT_FLAG_COPY, \
+        arg1_name, arg1_val, arg2_name, arg2_val)
+// Creates a scope of a sampling state with the given category and name (both must
+// be constant strings). These states are intended for a sampling profiler.
+// Implementation note: we store category and name together because we don't
+// want the inconsistency/expense of storing two pointers.
+// |thread_bucket| is [0..2] and is used to statically isolate samples in one
+// thread from others.
+//
+// {  // The sampling state is set within this scope.
+//    TRACE_EVENT_SAMPLING_STATE_SCOPE_FOR_BUCKET(0, "category", "name");
+//    ...;
+// }
+#define TRACE_EVENT_SCOPED_SAMPLING_STATE_FOR_BUCKET(bucket_number, category, name) \
+    TraceEvent::SamplingStateScope<bucket_number> traceEventSamplingScope(category "\0" name);
+// Returns a current sampling state of the given bucket.
+// The format of the returned string is "category\0name".
+#define TRACE_EVENT_GET_SAMPLING_STATE_FOR_BUCKET(bucket_number) \
+    TraceEvent::SamplingStateScope<bucket_number>::current()
+// Sets a current sampling state of the given bucket.
+// |category| and |name| have to be constant strings.
+#define TRACE_EVENT_SET_SAMPLING_STATE_FOR_BUCKET(bucket_number, category, name) \
+    TraceEvent::SamplingStateScope<bucket_number>::set(category "\0" name)
+// Sets a current sampling state of the given bucket.
+// |categoryAndName| doesn't need to be a constant string.
+// The format of the string is "category\0name".
+#define TRACE_EVENT_SET_NONCONST_SAMPLING_STATE_FOR_BUCKET(bucket_number, categoryAndName) \
+    TraceEvent::SamplingStateScope<bucket_number>::set(categoryAndName)
+// Syntactic sugars for the sampling tracing in the main thread.
+#define TRACE_EVENT_SCOPED_SAMPLING_STATE(category, name) \
+    TRACE_EVENT_SCOPED_SAMPLING_STATE_FOR_BUCKET(0, category, name)
+#define TRACE_EVENT_GET_SAMPLING_STATE() \
+    TRACE_EVENT_GET_SAMPLING_STATE_FOR_BUCKET(0)
+#define TRACE_EVENT_SET_SAMPLING_STATE(category, name) \
+    TRACE_EVENT_SET_SAMPLING_STATE_FOR_BUCKET(0, category, name)
+#define TRACE_EVENT_SET_NONCONST_SAMPLING_STATE(categoryAndName) \
+    TRACE_EVENT_SET_NONCONST_SAMPLING_STATE_FOR_BUCKET(0, categoryAndName)
+////////////////////////////////////////////////////////////////////////////////
+// Implementation specific tracing API definitions.
+// Get a pointer to the enabled state of the given trace category. Only
+// long-lived literal strings should be given as the category name. The returned
+// pointer can be held permanently in a local static for example. If the
+// unsigned char is non-zero, tracing is enabled. If tracing is enabled,
+// TRACE_EVENT_API_ADD_TRACE_EVENT can be called. It's OK if tracing is disabled
+// between the load of the tracing state and the call to
+// TRACE_EVENT_API_ADD_TRACE_EVENT, because this flag only provides an early out
+// for best performance when tracing is disabled.
+// const unsigned char*
+//     TRACE_EVENT_API_GET_CATEGORY_ENABLED(const char* category_name)
+#define TRACE_EVENT_API_GET_CATEGORY_ENABLED \
+    gl::TraceGetTraceCategoryEnabledFlag
+// Add a trace event to the platform tracing system.
+// void TRACE_EVENT_API_ADD_TRACE_EVENT(
+//                    char phase,
+//                    const unsigned char* category_enabled,
+//                    const char* name,
+//                    unsigned long long id,
+//                    int num_args,
+//                    const char** arg_names,
+//                    const unsigned char* arg_types,
+//                    const unsigned long long* arg_values,
+//                    unsigned char flags)
+#define TRACE_EVENT_API_ADD_TRACE_EVENT \
+    gl::TraceAddTraceEvent
+////////////////////////////////////////////////////////////////////////////////
+// Implementation detail: trace event macros create temporary variables
+// to keep instrumentation overhead low. These macros give each temporary
+// variable a unique name based on the line number to prevent name collissions.
+#define INTERNAL_TRACE_EVENT_UID3(a, b) \
+    trace_event_unique_##a##b
+#define INTERNAL_TRACE_EVENT_UID2(a, b) \
+    INTERNAL_TRACE_EVENT_UID3(a, b)
+#define INTERNALTRACEEVENTUID(name_prefix) \
+    INTERNAL_TRACE_EVENT_UID2(name_prefix, __LINE__)
+// Implementation detail: internal macro to create static category.
+#define INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category) \
+    static const unsigned char* INTERNALTRACEEVENTUID(catstatic) = 0; \
+    if (!INTERNALTRACEEVENTUID(catstatic)) \
+      INTERNALTRACEEVENTUID(catstatic) = \
+          TRACE_EVENT_API_GET_CATEGORY_ENABLED(category);
+// Implementation detail: internal macro to create static category and add
+// event if the category is enabled.
+#define INTERNAL_TRACE_EVENT_ADD(phase, category, name, flags, ...) \
+    do { \
+        INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category); \
+        if (*INTERNALTRACEEVENTUID(catstatic)) { \
+            gl::TraceEvent::addTraceEvent( \
+                phase, INTERNALTRACEEVENTUID(catstatic), name, \
+                gl::TraceEvent::noEventId, flags, ##__VA_ARGS__); \
+        } \
+    } while (0)
+// Implementation detail: internal macro to create static category and add begin
+// event if the category is enabled. Also adds the end event when the scope
+// ends.
+#define INTERNAL_TRACE_EVENT_ADD_SCOPED(category, name, ...) \
+    INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category); \
+    gl::TraceEvent::TraceEndOnScopeClose \
+        INTERNALTRACEEVENTUID(profileScope); \
+    if (*INTERNALTRACEEVENTUID(catstatic)) { \
+      gl::TraceEvent::addTraceEvent( \
+          TRACE_EVENT_PHASE_BEGIN, \
+          INTERNALTRACEEVENTUID(catstatic), \
+          name, gl::TraceEvent::noEventId, \
+          TRACE_EVENT_FLAG_NONE, ##__VA_ARGS__); \
+      INTERNALTRACEEVENTUID(profileScope).initialize( \
+          INTERNALTRACEEVENTUID(catstatic), name); \
+    }
+// Implementation detail: internal macro to create static category and add
+// event if the category is enabled.
+#define INTERNAL_TRACE_EVENT_ADD_WITH_ID(phase, category, name, id, flags, \
+                                         ...) \
+    do { \
+        INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category); \
+        if (*INTERNALTRACEEVENTUID(catstatic)) { \
+            unsigned char traceEventFlags = flags | TRACE_EVENT_FLAG_HAS_ID; \
+            gl::TraceEvent::TraceID traceEventTraceID( \
+                id, &traceEventFlags); \
+            gl::TraceEvent::addTraceEvent( \
+                phase, INTERNALTRACEEVENTUID(catstatic), \
+                name, traceEventTraceID.data(), traceEventFlags, \
+                ##__VA_ARGS__); \
+        } \
+    } while (0)
+// Notes regarding the following definitions:
+// New values can be added and propagated to third party libraries, but existing
+// definitions must never be changed, because third party libraries may use old
+// definitions.
+// Phase indicates the nature of an event entry. E.g. part of a begin/end pair.
+#define TRACE_EVENT_PHASE_BEGIN    ('B')
+#define TRACE_EVENT_PHASE_END      ('E')
+#define TRACE_EVENT_PHASE_INSTANT  ('I')
+#define TRACE_EVENT_PHASE_ASYNC_BEGIN ('S')
+#define TRACE_EVENT_PHASE_ASYNC_STEP  ('T')
+#define TRACE_EVENT_PHASE_ASYNC_END   ('F')
+#define TRACE_EVENT_PHASE_METADATA ('M')
+#define TRACE_EVENT_PHASE_COUNTER  ('C')
+#define TRACE_EVENT_PHASE_SAMPLE  ('P')
+// Flags for changing the behavior of TRACE_EVENT_API_ADD_TRACE_EVENT.
+#define TRACE_EVENT_FLAG_NONE        (static_cast<unsigned char>(0))
+#define TRACE_EVENT_FLAG_COPY        (static_cast<unsigned char>(1 << 0))
+#define TRACE_EVENT_FLAG_HAS_ID      (static_cast<unsigned char>(1 << 1))
+#define TRACE_EVENT_FLAG_MANGLE_ID   (static_cast<unsigned char>(1 << 2))
+// Type values for identifying types in the TraceValue union.
+#define TRACE_VALUE_TYPE_BOOL         (static_cast<unsigned char>(1))
+#define TRACE_VALUE_TYPE_UINT         (static_cast<unsigned char>(2))
+#define TRACE_VALUE_TYPE_INT          (static_cast<unsigned char>(3))
+#define TRACE_VALUE_TYPE_DOUBLE       (static_cast<unsigned char>(4))
+#define TRACE_VALUE_TYPE_POINTER      (static_cast<unsigned char>(5))
+#define TRACE_VALUE_TYPE_STRING       (static_cast<unsigned char>(6))
+#define TRACE_VALUE_TYPE_COPY_STRING  (static_cast<unsigned char>(7))
+namespace gl {
+namespace TraceEvent {
+// Specify these values when the corresponding argument of addTraceEvent is not
+// used.
+const int zeroNumArgs = 0;
+const unsigned long long noEventId = 0;
+// TraceID encapsulates an ID that can either be an integer or pointer. Pointers
+// are mangled with the Process ID so that they are unlikely to collide when the
+// same pointer is used on different processes.
+class TraceID {
+public:
+    explicit TraceID(const void* id, unsigned char* flags) :
+        m_data(static_cast<unsigned long long>(reinterpret_cast<unsigned long>(id)))
+    {
+        *flags |= TRACE_EVENT_FLAG_MANGLE_ID;
+    }
+    explicit TraceID(unsigned long long id, unsigned char* flags) : m_data(id) { (void)flags; }
+    explicit TraceID(unsigned long id, unsigned char* flags) : m_data(id) { (void)flags; }
+    explicit TraceID(unsigned int id, unsigned char* flags) : m_data(id) { (void)flags; }
+    explicit TraceID(unsigned short id, unsigned char* flags) : m_data(id) { (void)flags; }
+    explicit TraceID(unsigned char id, unsigned char* flags) : m_data(id) { (void)flags; }
+    explicit TraceID(long long id, unsigned char* flags) :
+        m_data(static_cast<unsigned long long>(id)) { (void)flags; }
+    explicit TraceID(long id, unsigned char* flags) :
+        m_data(static_cast<unsigned long long>(id)) { (void)flags; }
+    explicit TraceID(int id, unsigned char* flags) :
+        m_data(static_cast<unsigned long long>(id)) { (void)flags; }
+    explicit TraceID(short id, unsigned char* flags) :
+        m_data(static_cast<unsigned long long>(id)) { (void)flags; }
+    explicit TraceID(signed char id, unsigned char* flags) :
+        m_data(static_cast<unsigned long long>(id)) { (void)flags; }
+    unsigned long long data() const { return m_data; }
+private:
+    unsigned long long m_data;
+};
+// Simple union to store various types as unsigned long long.
+union TraceValueUnion {
+    bool m_bool;
+    unsigned long long m_uint;
+    long long m_int;
+    double m_double;
+    const void* m_pointer;
+    const char* m_string;
+};
+// Simple container for const char* that should be copied instead of retained.
+class TraceStringWithCopy {
+public:
+    explicit TraceStringWithCopy(const char* str) : m_str(str) { }
+    operator const char* () const { return m_str; }
+private:
+    const char* m_str;
+};
+// Define setTraceValue for each allowed type. It stores the type and
+// value in the return arguments. This allows this API to avoid declaring any
+// structures so that it is portable to third_party libraries.
+#define INTERNAL_DECLARE_SET_TRACE_VALUE(actual_type, \
+                                         union_member, \
+                                         value_type_id) \
+    static inline void setTraceValue(actual_type arg, \
+                                     unsigned char* type, \
+                                     unsigned long long* value) { \
+        TraceValueUnion typeValue; \
+        typeValue.union_member = arg; \
+        *type = value_type_id; \
+        *value = typeValue.m_uint; \
+    }
+// Simpler form for int types that can be safely casted.
+#define INTERNAL_DECLARE_SET_TRACE_VALUE_INT(actual_type, \
+                                             value_type_id) \
+    static inline void setTraceValue(actual_type arg, \
+                                     unsigned char* type, \
+                                     unsigned long long* value) { \
+        *type = value_type_id; \
+        *value = static_cast<unsigned long long>(arg); \
+    }
+INTERNAL_DECLARE_SET_TRACE_VALUE_INT(unsigned long long, TRACE_VALUE_TYPE_UINT)
+INTERNAL_DECLARE_SET_TRACE_VALUE_INT(unsigned int, TRACE_VALUE_TYPE_UINT)
+INTERNAL_DECLARE_SET_TRACE_VALUE_INT(unsigned short, TRACE_VALUE_TYPE_UINT)
+INTERNAL_DECLARE_SET_TRACE_VALUE_INT(unsigned char, TRACE_VALUE_TYPE_UINT)
+INTERNAL_DECLARE_SET_TRACE_VALUE_INT(long long, TRACE_VALUE_TYPE_INT)
+INTERNAL_DECLARE_SET_TRACE_VALUE_INT(int, TRACE_VALUE_TYPE_INT)
+INTERNAL_DECLARE_SET_TRACE_VALUE_INT(short, TRACE_VALUE_TYPE_INT)
+INTERNAL_DECLARE_SET_TRACE_VALUE_INT(signed char, TRACE_VALUE_TYPE_INT)
+INTERNAL_DECLARE_SET_TRACE_VALUE(bool, m_bool, TRACE_VALUE_TYPE_BOOL)
+INTERNAL_DECLARE_SET_TRACE_VALUE(double, m_double, TRACE_VALUE_TYPE_DOUBLE)
+INTERNAL_DECLARE_SET_TRACE_VALUE(const void*, m_pointer,
+                                 TRACE_VALUE_TYPE_POINTER)
+INTERNAL_DECLARE_SET_TRACE_VALUE(const char*, m_string,
+                                 TRACE_VALUE_TYPE_STRING)
+INTERNAL_DECLARE_SET_TRACE_VALUE(const TraceStringWithCopy&, m_string,
+                                 TRACE_VALUE_TYPE_COPY_STRING)
+#undef INTERNAL_DECLARE_SET_TRACE_VALUE
+#undef INTERNAL_DECLARE_SET_TRACE_VALUE_INT
+static inline void setTraceValue(const std::string& arg,
+                                 unsigned char* type,
+                                 unsigned long long* value) {
+    TraceValueUnion typeValue;
+    typeValue.m_string = arg.data();
+    *type = TRACE_VALUE_TYPE_COPY_STRING;
+    *value = typeValue.m_uint;
+}
+// These addTraceEvent template functions are defined here instead of in the
+// macro, because the arg values could be temporary string objects. In order to
+// store pointers to the internal c_str and pass through to the tracing API, the
+// arg values must live throughout these procedures.
+static inline void addTraceEvent(char phase,
+                                const unsigned char* categoryEnabled,
+                                const char* name,
+                                unsigned long long id,
+                                unsigned char flags) {
+    TRACE_EVENT_API_ADD_TRACE_EVENT(
+        phase, categoryEnabled, name, id,
+        zeroNumArgs, 0, 0, 0,
+        flags);
+}
+template<class ARG1_TYPE>
+static inline void addTraceEvent(char phase,
+                                const unsigned char* categoryEnabled,
+                                const char* name,
+                                unsigned long long id,
+                                unsigned char flags,
+                                const char* arg1Name,
+                                const ARG1_TYPE& arg1Val) {
+    const int numArgs = 1;
+    unsigned char argTypes[1];
+    unsigned long long argValues[1];
+    setTraceValue(arg1Val, &argTypes[0], &argValues[0]);
+    TRACE_EVENT_API_ADD_TRACE_EVENT(
+        phase, categoryEnabled, name, id,
+        numArgs, &arg1Name, argTypes, argValues,
+        flags);
+}
+template<class ARG1_TYPE, class ARG2_TYPE>
+static inline void addTraceEvent(char phase,
+                                const unsigned char* categoryEnabled,
+                                const char* name,
+                                unsigned long long id,
+                                unsigned char flags,
+                                const char* arg1Name,
+                                const ARG1_TYPE& arg1Val,
+                                const char* arg2Name,
+                                const ARG2_TYPE& arg2Val) {
+    const int numArgs = 2;
+    const char* argNames[2] = { arg1Name, arg2Name };
+    unsigned char argTypes[2];
+    unsigned long long argValues[2];
+    setTraceValue(arg1Val, &argTypes[0], &argValues[0]);
+    setTraceValue(arg2Val, &argTypes[1], &argValues[1]);
+    return TRACE_EVENT_API_ADD_TRACE_EVENT(
+        phase, categoryEnabled, name, id,
+        numArgs, argNames, argTypes, argValues,
+        flags);
+}
+// Used by TRACE_EVENTx macro. Do not use directly.
+class TraceEndOnScopeClose {
+public:
+    // Note: members of m_data intentionally left uninitialized. See initialize.
+    TraceEndOnScopeClose() : m_pdata(0) { }
+    ~TraceEndOnScopeClose()
+    {
+        if (m_pdata)
+            addEventIfEnabled();
+    }
+    void initialize(const unsigned char* categoryEnabled,
+                    const char* name)
+    {
+        m_data.categoryEnabled = categoryEnabled;
+        m_data.name = name;
+        m_pdata = &m_data;
+    }
+private:
+    // Add the end event if the category is still enabled.
+    void addEventIfEnabled()
+    {
+        // Only called when m_pdata is non-null.
+        if (*m_pdata->categoryEnabled) {
+            TRACE_EVENT_API_ADD_TRACE_EVENT(
+                TRACE_EVENT_PHASE_END,
+                m_pdata->categoryEnabled,
+                m_pdata->name, noEventId,
+                zeroNumArgs, 0, 0, 0,
+                TRACE_EVENT_FLAG_NONE);
+        }
+    }
+    // This Data struct workaround is to avoid initializing all the members
+    // in Data during construction of this object, since this object is always
+    // constructed, even when tracing is disabled. If the members of Data were
+    // members of this class instead, compiler warnings occur about potential
+    // uninitialized accesses.
+    struct Data {
+        const unsigned char* categoryEnabled;
+        const char* name;
+    };
+    Data* m_pdata;
+    Data m_data;
+};
+// TraceEventSamplingStateScope records the current sampling state
+// and sets a new sampling state. When the scope exists, it restores
+// the sampling state having recorded.
+template<size_t BucketNumber>
+class SamplingStateScope {
+public:
+    SamplingStateScope(const char* categoryAndName)
+    {
+        m_previousState = SamplingStateScope<BucketNumber>::current();
+        SamplingStateScope<BucketNumber>::set(categoryAndName);
+    }
+    ~SamplingStateScope()
+    {
+        SamplingStateScope<BucketNumber>::set(m_previousState);
+    }
+    // FIXME: Make load/store to traceSamplingState[] thread-safe and atomic.
+    static inline const char* current()
+    {
+        return reinterpret_cast<const char*>(*gl::traceSamplingState[BucketNumber]);
+    }
+    static inline void set(const char* categoryAndName)
+    {
+        *gl::traceSamplingState[BucketNumber] = reinterpret_cast<long>(const_cast<char*>(categoryAndName));
+    }
+private:
+    const char* m_previousState;
+};
+} // namespace TraceEvent
+} // namespace gl
+#endif