diff options
author | Miguel Costa <miguel.costa@qt.io> | 2018-06-26 16:56:45 +0200 |
---|---|---|
committer | Andre de la Rocha <andre.rocha@qt.io> | 2018-10-13 21:36:35 +0000 |
commit | 0a7aebadfbb3534284546aa3ca8612314c08f136 (patch) | |
tree | e94ee33ae3bb9b96fc3047c6455d47ac4920bfbf /src/3rdparty/angle/src/third_party/trace_event | |
parent | 656e89f875ad2008ca16cc673b687a22daa294c9 (diff) |
Update ANGLE to chromium/3280
Change-Id: I0802c0d7486f772d361f87a544d6c5af937f4ca1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/3rdparty/angle/src/third_party/trace_event')
-rw-r--r-- | src/3rdparty/angle/src/third_party/trace_event/trace_event.h | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/3rdparty/angle/src/third_party/trace_event/trace_event.h b/src/3rdparty/angle/src/third_party/trace_event/trace_event.h index 3c85d22efa..bdb8804428 100644 --- a/src/3rdparty/angle/src/third_party/trace_event/trace_event.h +++ b/src/3rdparty/angle/src/third_party/trace_event/trace_event.h @@ -690,27 +690,27 @@ static inline void setTraceValue(const std::string& arg, // store pointers to the internal c_str and pass through to the tracing API, the // arg values must live throughout these procedures. -static inline angle::Platform::TraceEventHandle addTraceEvent( - char phase, - const unsigned char* categoryEnabled, - const char* name, - unsigned long long id, - unsigned char flags) { +static inline angle::TraceEventHandle addTraceEvent(char phase, + const unsigned char *categoryEnabled, + const char *name, + unsigned long long id, + unsigned char flags) +{ return TRACE_EVENT_API_ADD_TRACE_EVENT( phase, categoryEnabled, name, id, zeroNumArgs, 0, 0, 0, flags); } -template<class ARG1_TYPE> -static inline angle::Platform::TraceEventHandle addTraceEvent( - char phase, - const unsigned char* categoryEnabled, - const char* name, - unsigned long long id, - unsigned char flags, - const char* arg1Name, - const ARG1_TYPE& arg1Val) { +template <class ARG1_TYPE> +static inline angle::TraceEventHandle 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]; @@ -721,17 +721,17 @@ static inline angle::Platform::TraceEventHandle addTraceEvent( flags); } -template<class ARG1_TYPE, class ARG2_TYPE> -static inline angle::Platform::TraceEventHandle 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) { +template <class ARG1_TYPE, class ARG2_TYPE> +static inline angle::TraceEventHandle 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]; |