Merge "Run gen_merged_protos."
diff --git a/protos/perfetto/trace/perfetto_trace.proto b/protos/perfetto/trace/perfetto_trace.proto
index d3cc00d..6ef12a6 100644
--- a/protos/perfetto/trace/perfetto_trace.proto
+++ b/protos/perfetto/trace/perfetto_trace.proto
@@ -3514,18 +3514,16 @@
message GpuCounterEvent {
// The first trace packet of each session should include counter_spec.
- message GpuCounterSpec {
- optional uint32 counter_id = 1;
- optional string name = 2;
- optional string description = 3;
- }
- repeated GpuCounterSpec counter_specs = 1;
+ optional GpuCounterDescriptor counter_descriptor = 1;
message GpuCounter {
// required. Identifier for counter.
optional uint32 counter_id = 1;
// required. Value of the counter.
- optional int64 value = 2;
+ oneof value {
+ int64 int_value = 2;
+ double double_value = 3;
+ }
}
repeated GpuCounter counters = 2;
}
@@ -3591,6 +3589,21 @@
// End of protos/perfetto/trace/gpu/gpu_render_stage_event.proto
+// Begin of protos/perfetto/common/gpu_counter_descriptor.proto
+
+// Description of GPU counters.
+// This message is sent by a GPU counter producer to specify the counters available in the hardware.
+message GpuCounterDescriptor {
+ message GpuCounterSpec {
+ optional uint32 counter_id = 1;
+ optional string name = 2;
+ optional string description = 3;
+ }
+ repeated GpuCounterSpec specs = 1;
+}
+
+// End of protos/perfetto/common/gpu_counter_descriptor.proto
+
// Begin of protos/perfetto/config/android/android_log_config.proto
message AndroidLogConfig {
diff --git a/tools/gen_merged_protos b/tools/gen_merged_protos
index e1a6a67..5f68999 100755
--- a/tools/gen_merged_protos
+++ b/tools/gen_merged_protos
@@ -92,6 +92,7 @@
'protos/perfetto/trace/trigger.proto',
'protos/perfetto/trace/gpu/gpu_counter_event.proto',
'protos/perfetto/trace/gpu/gpu_render_stage_event.proto',
+ 'protos/perfetto/common/gpu_counter_descriptor.proto',
)
MERGED_TRACE_PROTO = 'protos/perfetto/trace/perfetto_trace.proto'