commit aa9175d6761d7ff7a172d637fda4a17df64453b5
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 09 18:07:45 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 09 18:07:45 2019 +0000
tree a63db6e0617fbec34185465a53d78a4a614ffabf
parent 472e0a25b98b0390176bede0ebae84b776d92e5c
parent 4364315cb746afde324dc6d149670c01abeb9948

Merge "proto: Update prefix of GpuLog's Severity enum again"

protos/perfetto/trace/gpu/gpu_log.proto

diff --git a/protos/perfetto/trace/gpu/gpu_log.proto b/protos/perfetto/trace/gpu/gpu_log.proto
index 7e61139..1c39bc0 100644
--- a/protos/perfetto/trace/gpu/gpu_log.proto
+++ b/protos/perfetto/trace/gpu/gpu_log.proto
@@ -22,12 +22,12 @@
 // Message for logging events GPU data producer.
 message GpuLog {
   enum Severity {
-    SEVERITY_UNSPECIFIED = 0;
-    SEVERITY_VERBOSE = 1;
-    SEVERITY_DEBUG = 2;
-    SEVERITY_INFO = 3;
-    SEVERITY_WARNING = 4;
-    SEVERITY_ERROR = 5;
+    LOG_SEVERITY_UNSPECIFIED = 0;
+    LOG_SEVERITY_VERBOSE = 1;
+    LOG_SEVERITY_DEBUG = 2;
+    LOG_SEVERITY_INFO = 3;
+    LOG_SEVERITY_WARNING = 4;
+    LOG_SEVERITY_ERROR = 5;
   };
   optional Severity severity = 1;
 

protos/perfetto/trace/perfetto_trace.proto

diff --git a/protos/perfetto/trace/perfetto_trace.proto b/protos/perfetto/trace/perfetto_trace.proto
index b27257f..51a7a6a 100644
--- a/protos/perfetto/trace/perfetto_trace.proto
+++ b/protos/perfetto/trace/perfetto_trace.proto
@@ -4149,12 +4149,12 @@
 // Message for logging events GPU data producer.
 message GpuLog {
   enum Severity {
-    SEVERITY_UNSPECIFIED = 0;
-    SEVERITY_VERBOSE = 1;
-    SEVERITY_DEBUG = 2;
-    SEVERITY_INFO = 3;
-    SEVERITY_WARNING = 4;
-    SEVERITY_ERROR = 5;
+    LOG_SEVERITY_UNSPECIFIED = 0;
+    LOG_SEVERITY_VERBOSE = 1;
+    LOG_SEVERITY_DEBUG = 2;
+    LOG_SEVERITY_INFO = 3;
+    LOG_SEVERITY_WARNING = 4;
+    LOG_SEVERITY_ERROR = 5;
   };
   optional Severity severity = 1;