OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/ds: Update to Perfetto API v28.0

Browse Source 
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 <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18056>
This commit is contained in:
Sami Kyöstilä
2022-08-15 20:08:17 +10:00
committed by Marge Bot
parent 0c6fbfca0c
commit b936d638ab
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/intel/ds/intel_driver_ds.cc
View File

@@ -139,15 +139,14 @@ PERFETTO_DEFINE_DATA_SOURCE_STATIC_MEMBERS(IntelRenderpassDataSource);
using perfetto::protos::pbzero::InternedGpuRenderStageSpecification_RenderStageCategory; using perfetto::protos::pbzero::InternedGpuRenderStageSpecification_RenderStageCategory;
enum InternedGpuRenderStageSpecification_RenderStageCategory InternedGpuRenderStageSpecification_RenderStageCategory
i915_engine_class_to_category(enum drm_i915_gem_engine_class engine_class) i915_engine_class_to_category(enum drm_i915_gem_engine_class engine_class)
{ {
switch (engine_class) { switch (engine_class) {
case I915_ENGINE_CLASS_RENDER: case I915_ENGINE_CLASS_RENDER:
return InternedGpuRenderStageSpecification_RenderStageCategory:: return InternedGpuRenderStageSpecification_RenderStageCategory::GRAPHICS;
InternedGpuRenderStageSpecification_RenderStageCategory_GRAPHICS;
default: default:
return InternedGpuRenderStageSpecification_RenderStageCategory::InternedGpuRenderStageSpecification_RenderStageCategory_OTHER; return InternedGpuRenderStageSpecification_RenderStageCategory::OTHER;
} }
} }
@@ -217,10 +216,10 @@ send_descriptors(IntelRenderpassDataSource::TraceContext &ctx,
desc->set_pid(getpid()); desc->set_pid(getpid());
switch (device->api) { switch (device->api) {
case INTEL_DS_API_OPENGL: 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; break;
case INTEL_DS_API_VULKAN: case INTEL_DS_API_VULKAN:
desc->set_api(perfetto::protos::pbzero::InternedGraphicsContext_Api_VULKAN); desc->set_api(perfetto::protos::pbzero::InternedGraphicsContext_Api::VULKAN);
break; break;
default: default:
break; break;

2
subprojects/perfetto.wrap
View File

@@ -2,4 +2,4 @@
directory = perfetto directory = perfetto
url = https://android.googlesource.com/platform/external/perfetto url = https://android.googlesource.com/platform/external/perfetto
revision = v27.1 revision = v28.0