diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
tree | 3d53dacf6430f9099e1fb20835881205de674961 /src/3rdparty/angle/src/common/event_tracer.cpp | |
parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'src/3rdparty/angle/src/common/event_tracer.cpp')
-rw-r--r-- | src/3rdparty/angle/src/common/event_tracer.cpp | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/3rdparty/angle/src/common/event_tracer.cpp b/src/3rdparty/angle/src/common/event_tracer.cpp index c9eb5e3073..6dc8458acc 100644 --- a/src/3rdparty/angle/src/common/event_tracer.cpp +++ b/src/3rdparty/angle/src/common/event_tracer.cpp @@ -11,10 +11,11 @@ namespace angle const unsigned char *GetTraceCategoryEnabledFlag(const char *name) { - angle::Platform *platform = ANGLEPlatformCurrent(); + auto *platform = ANGLEPlatformCurrent(); ASSERT(platform); - const unsigned char *categoryEnabledFlag = platform->getTraceCategoryEnabledFlag(name); + const unsigned char *categoryEnabledFlag = + platform->getTraceCategoryEnabledFlag(platform, name); if (categoryEnabledFlag != nullptr) { return categoryEnabledFlag; @@ -24,33 +25,31 @@ const unsigned char *GetTraceCategoryEnabledFlag(const char *name) return &disabled; } -Platform::TraceEventHandle AddTraceEvent(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) +angle::TraceEventHandle AddTraceEvent(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) { - angle::Platform *platform = ANGLEPlatformCurrent(); + auto *platform = ANGLEPlatformCurrent(); ASSERT(platform); - double timestamp = platform->monotonicallyIncreasingTime(); + double timestamp = platform->monotonicallyIncreasingTime(platform); if (timestamp != 0) { - angle::Platform::TraceEventHandle handle = - platform->addTraceEvent(phase, - categoryGroupEnabled, - name, - id, - timestamp, - numArgs, - argNames, - argTypes, - argValues, - flags); + angle::TraceEventHandle handle = + platform->addTraceEvent(platform, phase, categoryGroupEnabled, name, id, timestamp, + numArgs, argNames, argTypes, argValues, flags); ASSERT(handle != 0); return handle; } - return static_cast<Platform::TraceEventHandle>(0); + return static_cast<angle::TraceEventHandle>(0); } } // namespace angle |