From 6a706a623eda663eea5af408c8bf75213d8b2bc5 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Fri, 21 May 2021 14:49:36 -0700 Subject: [PATCH] vkr: update venus-protocol for dispatch tracing Signed-off-by: Chia-I Wu Reviewed-by: Yiwei Zhang --- src/venus-protocol/vn_protocol_renderer.h | 2 +- .../vn_protocol_renderer_dispatches.h | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/venus-protocol/vn_protocol_renderer.h b/src/venus-protocol/vn_protocol_renderer.h index 823ba82..f6a664a 100644 --- a/src/venus-protocol/vn_protocol_renderer.h +++ b/src/venus-protocol/vn_protocol_renderer.h @@ -1,4 +1,4 @@ -/* This file is generated by venus-protocol git-e60093dc. */ +/* This file is generated by venus-protocol git-1975d149. */ /* * Copyright 2020 Google LLC diff --git a/src/venus-protocol/vn_protocol_renderer_dispatches.h b/src/venus-protocol/vn_protocol_renderer_dispatches.h index 84273b6..4a8d7a7 100644 --- a/src/venus-protocol/vn_protocol_renderer_dispatches.h +++ b/src/venus-protocol/vn_protocol_renderer_dispatches.h @@ -8,6 +8,8 @@ #ifndef VN_PROTOCOL_RENDERER_DISPATCHES_H #define VN_PROTOCOL_RENDERER_DISPATCHES_H +#include "virgl_util.h" + #include "vn_protocol_renderer_structs.h" #include "vn_protocol_renderer_transport.h" #include "vn_protocol_renderer_instance.h" @@ -439,10 +441,15 @@ static inline void vn_dispatch_command(struct vn_dispatch_context *ctx) vn_decode_VkCommandTypeEXT(ctx->decoder, &cmd_type); vn_decode_VkFlags(ctx->decoder, &cmd_flags); - if (cmd_type < 195 && vn_dispatch_table[cmd_type]) - vn_dispatch_table[cmd_type](ctx, cmd_flags); - else - vn_cs_decoder_set_fatal(ctx->decoder); + { +#ifdef DEBUG + TRACE_SCOPE_SLOW(vn_dispatch_command_name(cmd_type)); +#endif + if (cmd_type < 195 && vn_dispatch_table[cmd_type]) + vn_dispatch_table[cmd_type](ctx, cmd_flags); + else + vn_cs_decoder_set_fatal(ctx->decoder); + } if (vn_cs_decoder_get_fatal(ctx->decoder)) vn_dispatch_debug_log(ctx, "%s resulted in CS error", vn_dispatch_command_name(cmd_type));