From b936d638ab039f090b7826e2d44e8811b9e32309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20Ky=C3=B6stil=C3=A4?= Date: Mon, 15 Aug 2022 20:08:17 +1000 Subject: [PATCH] intel/ds: Update to Perfetto API v28.0 Perfetto v28.0 changes the naming scheme of generated enum constants. Update our code to match and roll the version of Perfetto forward accordingly. No functional changes. Acked-by: Lionel Landwerlin Part-of: --- src/intel/ds/intel_driver_ds.cc | 11 +++++------ subprojects/perfetto.wrap | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/intel/ds/intel_driver_ds.cc b/src/intel/ds/intel_driver_ds.cc index e10ce0a653535..c4b0f6fa2af5c 100644 --- a/src/intel/ds/intel_driver_ds.cc +++ b/src/intel/ds/intel_driver_ds.cc @@ -139,15 +139,14 @@ PERFETTO_DEFINE_DATA_SOURCE_STATIC_MEMBERS(IntelRenderpassDataSource); using perfetto::protos::pbzero::InternedGpuRenderStageSpecification_RenderStageCategory; -enum InternedGpuRenderStageSpecification_RenderStageCategory +InternedGpuRenderStageSpecification_RenderStageCategory i915_engine_class_to_category(enum drm_i915_gem_engine_class engine_class) { switch (engine_class) { case I915_ENGINE_CLASS_RENDER: - return InternedGpuRenderStageSpecification_RenderStageCategory:: - InternedGpuRenderStageSpecification_RenderStageCategory_GRAPHICS; + return InternedGpuRenderStageSpecification_RenderStageCategory::GRAPHICS; default: - return InternedGpuRenderStageSpecification_RenderStageCategory::InternedGpuRenderStageSpecification_RenderStageCategory_OTHER; + return InternedGpuRenderStageSpecification_RenderStageCategory::OTHER; } } @@ -217,10 +216,10 @@ send_descriptors(IntelRenderpassDataSource::TraceContext &ctx, desc->set_pid(getpid()); switch (device->api) { case INTEL_DS_API_OPENGL: - desc->set_api(perfetto::protos::pbzero::InternedGraphicsContext_Api_OPEN_GL); + desc->set_api(perfetto::protos::pbzero::InternedGraphicsContext_Api::OPEN_GL); break; case INTEL_DS_API_VULKAN: - desc->set_api(perfetto::protos::pbzero::InternedGraphicsContext_Api_VULKAN); + desc->set_api(perfetto::protos::pbzero::InternedGraphicsContext_Api::VULKAN); break; default: break; diff --git a/subprojects/perfetto.wrap b/subprojects/perfetto.wrap index ad8689e3293fe..73a103e030267 100644 --- a/subprojects/perfetto.wrap +++ b/subprojects/perfetto.wrap @@ -2,4 +2,4 @@ directory = perfetto url = https://android.googlesource.com/platform/external/perfetto -revision = v27.1 +revision = v28.0