mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-21 05:49:57 -04:00
Name in a lost device's report the mesh draws of each marked pass, a group of draws the replay workers recorded between two marks, and in the fatal line how mesh draws are drawn.
A pass mark now counts its mesh draws and those that take their count from the GPU; the gap before a mark notes a group recorded by the workers, whose passes have no marks, where the report said "barriers and state only"; the fatal line names the mesh path (native, the mesh fallback, the emulation). The comment on the RX 6700 XT report in vk_exec.c called the last marked dispatch the replay's own: it is the game's (op_dispatch, cs d7566eb1). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -208,10 +208,12 @@ static GpGap gp_gaps[GP_GAPS];
|
||||
static uint32_t gp_ngaps, gp_gap_from = UINT32_MAX, gp_gap_kinds, gp_part = UINT32_MAX;
|
||||
static int gp_in_mark; // between a mark's start and its end
|
||||
static uint64_t gp_kind_n[VK_GAP_N], gp_kind_units[VK_GAP_N];
|
||||
static const char *const gp_kind_names[VK_GAP_N] = {
|
||||
static const char *const gp_kind_names[] = {
|
||||
"buffer copies", "buffer to texture copies", "texture to buffer copies", "texture copies", "buffer fills",
|
||||
"texture clears", "target clears", "the temporal upscaler", "write-back merges", "write-back copies",
|
||||
"depth twin copies", "texture pool marks", "mesh draw counts", "block-compressed target copies"};
|
||||
"depth twin copies", "texture pool marks", "mesh draw counts", "block-compressed target copies",
|
||||
"groups of draws the replay workers recorded, whose passes have no marks"};
|
||||
_Static_assert(sizeof gp_kind_names / sizeof gp_kind_names[0] == VK_GAP_N, "a name for every VK_GAP_* kind");
|
||||
static VkQueryPool gp_pool, gp_prims; // gp_prims: mesh primitives generated per pass (with meshShaderQueries)
|
||||
static VkQueryPool gp_stats; // fragment shader invocations per pass
|
||||
static int gp_state, gp_phase, gp_capture; // state 0 not set up, 1 on, -1 off; phase 0 idle, 1 capturing, 2 waiting
|
||||
@@ -673,13 +675,19 @@ static void describe_mark(uint32_t id, char *o, size_t size) {
|
||||
if (n < size) n += (size_t)snprintf(o + n, size - n, ", depth format %d", (int)m->depth);
|
||||
if (n >= size) return;
|
||||
if (m->draws == UINT32_MAX)
|
||||
snprintf(o + n, size - n, ", still recording; first draw vs %016llx fs %016llx", shader_id(m->first[0]),
|
||||
shader_id(m->first[1]));
|
||||
n += (size_t)snprintf(o + n, size - n, ", still recording; first draw vs %016llx fs %016llx", shader_id(m->first[0]),
|
||||
shader_id(m->first[1]));
|
||||
else if (!m->draws)
|
||||
snprintf(o + n, size - n, ", no draws");
|
||||
n += (size_t)snprintf(o + n, size - n, ", no draws");
|
||||
else
|
||||
snprintf(o + n, size - n, ", %u draws; first vs %016llx fs %016llx, last vs %016llx fs %016llx", m->draws,
|
||||
shader_id(m->first[0]), shader_id(m->first[1]), shader_id(m->last[0]), shader_id(m->last[1]));
|
||||
n += (size_t)snprintf(o + n, size - n, ", %u draws; first vs %016llx fs %016llx, last vs %016llx fs %016llx",
|
||||
m->draws, shader_id(m->first[0]), shader_id(m->first[1]), shader_id(m->last[0]),
|
||||
shader_id(m->last[1]));
|
||||
// The mesh draws among them: the RX 6000 losses whose marks named a pass were in passes that start with one, and
|
||||
// whether a pass held any (and how many took their count from the GPU) is what tells such a loss from another.
|
||||
if (n < size && (m->mesh || m->mesh_ind))
|
||||
snprintf(o + n, size - n, "; %u mesh draws, %u of them with the GPU's count", (unsigned)m->mesh + m->mesh_ind,
|
||||
(unsigned)m->mesh_ind);
|
||||
}
|
||||
|
||||
void vk_pass_marks_format(const char *source, uint32_t started, uint32_t finished, char *o, size_t size) {
|
||||
|
||||
Reference in New Issue
Block a user