Hash :
bc4ec4c1
Author :
Date :
2020-10-05T17:10:18
Vulkan: Plumb OpenGL ES commands to AGI/debuggers Use vkCmd*DebugUtilsLabelEXT() calls to delimit all GLES commands, and group them under GLES draw/dispatch calls. Plumb calls from the EVENT macro (for every GL entrypoint) to vkCmd*DebugUtilsLabelEXT() via a newly-implemented DebugAnnotatorVk class. Use a new dirty bit so that cached entrypoints are associated with a triggering draw/dispatch command. The DebugAnnotatorVk::beginEvent() method saves a string in a vector of all GL commands in ContextVk. The dirty bit converts the strings into begin-end vkCmd*DebugUtilsLabelEXT() pairs. The DebugAnnotatorVk::endEvent() method makes the final vkCmdEndDebugUtilsLabelEXT() call for a draw/dispatch command. Enable the OGL->VK mapping feature by setting "angle_enable_trace = true" in GN args. Bug: b/162068318 Bug: b/169243237 Change-Id: I61b6a8d113168c0ce578d6efd002d8a393659aba Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2451517 Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Ian Elliott <ianelliott@google.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104
//
// Copyright 2020 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// DebugAnnotatorVk.cpp: Vulkan helpers for adding trace annotations.
//
#include "libANGLE/renderer/vulkan/DebugAnnotatorVk.h"
#include "libANGLE/Context.h"
#include "libANGLE/entry_points_enum_autogen.h"
#include "libANGLE/renderer/vulkan/ContextVk.h"
namespace rx
{
DebugAnnotatorVk::DebugAnnotatorVk() {}
DebugAnnotatorVk::~DebugAnnotatorVk() {}
void DebugAnnotatorVk::beginEvent(gl::Context *context,
gl::EntryPoint entryPoint,
const char *eventName,
const char *eventMessage)
{
angle::LoggingAnnotator::beginEvent(context, entryPoint, eventName, eventMessage);
if (context)
{
ContextVk *contextVk = vk::GetImpl(static_cast<gl::Context *>(context));
contextVk->logEvent(eventMessage);
}
}
void DebugAnnotatorVk::endEvent(gl::Context *context,
const char *eventName,
gl::EntryPoint entryPoint)
{
angle::LoggingAnnotator::endEvent(context, eventName, entryPoint);
if (context && isDrawOrDispatchEntryPoint(entryPoint))
{
ContextVk *contextVk = vk::GetImpl(static_cast<gl::Context *>(context));
contextVk->endEventLog(entryPoint);
}
}
bool DebugAnnotatorVk::getStatus()
{
return true;
}
bool DebugAnnotatorVk::isDrawOrDispatchEntryPoint(gl::EntryPoint entryPoint) const
{
switch (entryPoint)
{
case gl::EntryPoint::DispatchCompute:
case gl::EntryPoint::DispatchComputeIndirect:
case gl::EntryPoint::DrawArrays:
case gl::EntryPoint::DrawArraysIndirect:
case gl::EntryPoint::DrawArraysInstanced:
case gl::EntryPoint::DrawArraysInstancedANGLE:
case gl::EntryPoint::DrawArraysInstancedBaseInstance:
case gl::EntryPoint::DrawArraysInstancedBaseInstanceANGLE:
case gl::EntryPoint::DrawArraysInstancedEXT:
case gl::EntryPoint::DrawBuffer:
case gl::EntryPoint::DrawBuffers:
case gl::EntryPoint::DrawBuffersEXT:
case gl::EntryPoint::DrawElements:
case gl::EntryPoint::DrawElementsBaseVertex:
case gl::EntryPoint::DrawElementsBaseVertexEXT:
case gl::EntryPoint::DrawElementsBaseVertexOES:
case gl::EntryPoint::DrawElementsIndirect:
case gl::EntryPoint::DrawElementsInstanced:
case gl::EntryPoint::DrawElementsInstancedANGLE:
case gl::EntryPoint::DrawElementsInstancedBaseInstance:
case gl::EntryPoint::DrawElementsInstancedBaseVertex:
case gl::EntryPoint::DrawElementsInstancedBaseVertexBaseInstance:
case gl::EntryPoint::DrawElementsInstancedBaseVertexBaseInstanceANGLE:
case gl::EntryPoint::DrawElementsInstancedBaseVertexEXT:
case gl::EntryPoint::DrawElementsInstancedBaseVertexOES:
case gl::EntryPoint::DrawElementsInstancedEXT:
case gl::EntryPoint::DrawPixels:
case gl::EntryPoint::DrawRangeElements:
case gl::EntryPoint::DrawRangeElementsBaseVertex:
case gl::EntryPoint::DrawRangeElementsBaseVertexEXT:
case gl::EntryPoint::DrawRangeElementsBaseVertexOES:
case gl::EntryPoint::DrawTexfOES:
case gl::EntryPoint::DrawTexfvOES:
case gl::EntryPoint::DrawTexiOES:
case gl::EntryPoint::DrawTexivOES:
case gl::EntryPoint::DrawTexsOES:
case gl::EntryPoint::DrawTexsvOES:
case gl::EntryPoint::DrawTexxOES:
case gl::EntryPoint::DrawTexxvOES:
case gl::EntryPoint::DrawTransformFeedback:
case gl::EntryPoint::DrawTransformFeedbackInstanced:
case gl::EntryPoint::DrawTransformFeedbackStream:
case gl::EntryPoint::DrawTransformFeedbackStreamInstanced:
return true;
default:
return false;
}
}
} // namespace rx