WIP: fix(vk): report native shader keys in draw statistics #169

Draft

klimovich008 wants to merge 3 commits from klimovich008/Longshot:codex/longshot-draw-stats378 into main

pull from: klimovich008/Longshot:codex/longshot-draw-stats378

merge into: MagicBeanDev:main

MagicBeanDev:main

Conversation 3 Commits 3 Files changed 3 +182 -8

klimovich008 commented 2026-11-13 09:09:48 +00:00

Contributor

• Copy link
• Copy Markdown

Why

Cached-program draw reports hide native shader keys, making suspect draws hard to identify.

What changed

• gpu/vk/vk_draw.cpp: snapshot four keys; append grouped rows.
• tests/test_draw_stats_codes.py: test production blocks with synthetic inputs.
• docs/development.md: document keys and limits.

Flags and settings

RX_VK_DRAW_STATS remains off.

Measurements

Fixture	main @ 0c74253d	this PR @ 2b04e006
Native keys	FAIL	PASS

Fails on the old code, passes now.

Testing

python -I -B tests/test_draw_stats_codes.py --cxx clang++: Windows, MinGW.

Full suite: 483 passed, 5 failed, 35 skipped. All five also fail on unmodified main: test_nup_paths, test_check_third_party, test_display_pointer, test_texture_staging_publication, test_release.

Not tested: this build's gameplay, validation, Linux, NVIDIA/Intel.

Needs other testers: none requested while WIP.

Screenshots

None.

Risk and rollback

Adds 1 MiB of metadata. Revert this commit to remove it.

Issues

Ports https://github.com/NotRexed/Hookshot/pull/2896. No game data is included.

Checklist

For everyone

• One topic.
• The title is a Conventional Commit (type(scope): description).
• Rebased on current main.
• python -I -B tests/run_all.py run and passing (any failure that also fails on main is named above).
• Tested in the game, or what wasn't is named under Testing.
• Testing filled in: what was tested, what wasn't, and what needs other testers (with test requests).
• Measured: main and this PR at named commits, on the same PC, scene and settings, at least 2 interleaved runs each, the median reported — gameplay pending.
• No game files, dumps, build output or generated files.
• third_party/ untouched (a new folder with a PROVENANCE.md instead).
• The license is OK: GPL-3.0-or-later, nothing incompatible and nothing decompiled.

If applicable

• AI assistance recorded with Assisted-by: / Co-Authored-By: trailers.
• Flags noted, and the switch reference updated (docs/development.md, the README).
• A game-free test added for the fix, failing on main and passing here.
• A check under tests/ that reads changed source updated in this PR, not weakened.
• Docs updated.

## Why Cached-program draw reports hide native shader keys, making suspect draws hard to identify. ## What changed - `gpu/vk/vk_draw.cpp`: snapshot four keys; append grouped rows. - `tests/test_draw_stats_codes.py`: test production blocks with synthetic inputs. - `docs/development.md`: document keys and limits. ## Flags and settings `RX_VK_DRAW_STATS` remains off. ## Measurements | Fixture | main @ 0c74253d | this PR @ 2b04e006 | |---|---|---| | Native keys | FAIL | PASS | Fails on the old code, passes now. ## Testing `python -I -B tests/test_draw_stats_codes.py --cxx clang++`: Windows, MinGW. Full suite: 483 passed, 5 failed, 35 skipped. All five also fail on unmodified main: `test_nup_paths`, `test_check_third_party`, `test_display_pointer`, `test_texture_staging_publication`, `test_release`. Not tested: this build's gameplay, validation, Linux, NVIDIA/Intel. Needs other testers: none requested while WIP. ## Screenshots None. ## Risk and rollback Adds 1 MiB of metadata. Revert this commit to remove it. ## Issues Ports https://github.com/NotRexed/Hookshot/pull/2896. No game data is included. ## Checklist ### For everyone - [x] One topic. - [x] The title is a Conventional Commit (`type(scope): description`). - [x] Rebased on current `main`. - [x] `python -I -B tests/run_all.py` run and passing (any failure that also fails on `main` is named above). - [x] Tested in the game, or what wasn't is named under Testing. - [x] Testing filled in: what was tested, what wasn't, and what needs other testers (with test requests). - [ ] Measured: main and this PR at named commits, on the same PC, scene and settings, at least 2 interleaved runs each, the median reported — gameplay pending. - [x] No game files, dumps, build output or generated files. - [x] `third_party/` untouched (a new folder with a `PROVENANCE.md` instead). - [x] The license is OK: GPL-3.0-or-later, nothing incompatible and nothing decompiled. ### If applicable - [x] AI assistance recorded with `Assisted-by:` / `Co-Authored-By:` trailers. - [x] Flags noted, and the switch reference updated (docs/development.md, the README). - [x] A game-free test added for the fix, failing on `main` and passing here. - [x] A check under `tests/` that reads changed source updated in this PR, not weakened. - [x] Docs updated.

klimovich008 added 1 commit 2026-11-13 09:09:49 +00:00

fix(vk): report native shader keys in draw statistics ... 684333d38f

Cached programs skip translation-miss logs, so per-program draw counts cannot
identify their native stages. Snapshot the four existing stage keys in each
accepted query and report distinct tuples alongside the original count rows.

Port https://github.com/NotRexed/Hookshot/pull/2896 to Longshot. The game-free
C++ check fails on Longshot main without the keys and passes with this change.
A matched Longshot game run and the full source-check suite remain pending.

Assisted-by: OpenAI Codex
Assisted-by: GPT-6.1 Sol
Co-Authored-By: OpenAI Codex <[email protected]>
Co-Authored-By: GPT-6.1 Sol <[email protected]>

klimovich008 commented 2026-11-13 09:18:20 +00:00

Author

Contributor

• Copy link
• Copy Markdown

From Codex's review: Source review found no code defect at 684333d3. The production-block C++ fixture fails against main 39647e1a and passes with this change, covering snapshot lifetime, distinct tuples, graphics/mesh/compute, inactive recording and query capacity. The full Windows source suite completed in two 4-worker shards: 497 passed, 4 failed, 38 skipped. Failure names are listed in the description; a release recheck with the existing OpenSSL still failed checksum/trust fixtures, so those failures have not been cleared. Longshot gameplay, full validation and a refresh onto the selected new main remain pending. This stays WIP.

From Codex's review: Source review found no code defect at 684333d3. The production-block C++ fixture fails against main 39647e1a and passes with this change, covering snapshot lifetime, distinct tuples, graphics/mesh/compute, inactive recording and query capacity. The full Windows source suite completed in two 4-worker shards: 497 passed, 4 failed, 38 skipped. Failure names are listed in the description; a release recheck with the existing OpenSSL still failed checksum/trust fixtures, so those failures have not been cleared. Longshot gameplay, full validation and a refresh onto the selected new main remain pending. This stays WIP.

klimovich008 added 1 commit 2026-11-13 11:37:14 +00:00

Merge commit '839e85ff2b' into codex/longshot-draw-stats378 914ca048fe

klimovich008 commented 2026-11-13 11:37:15 +00:00

Author

Contributor

• Copy link
• Copy Markdown

Merged the shared test base and reran all source checks: 496 passed, 4 existing main failures, 37 skipped. The focused check fails on the old source and passes here. Gameplay and latest-main refresh remain pending; stays WIP.

Merged the shared test base and reran all source checks: 496 passed, 4 existing main failures, 37 skipped. The focused check fails on the old source and passes here. Gameplay and latest-main refresh remain pending; stays WIP.

klimovich008 added 1 commit 2026-11-13 13:38:34 +00:00

chore: merge current main into native draw statistics ... 2b04e0066f

Keep the build-time documentation and the draw-statistics section. Runtime diagnostic code is unchanged by this refresh.

Assisted-by: OpenAI Codex

Assisted-by: gpt-6.1-sol

klimovich008 commented 2026-11-13 13:38:41 +00:00

Author

Contributor

• Copy link
• Copy Markdown

Merged current main and resolved the documentation conflict. Full source checks: 483 passed, 5 failed, 35 skipped; all five failures also reproduce on unmodified main. The native-key check fails on old source and passes here. Gameplay and Vulkan validation remain pending; this stays WIP.

Merged current main and resolved the documentation conflict. Full source checks: 483 passed, 5 failed, 35 skipped; all five failures also reproduce on unmodified main. The native-key check fails on old source and passes here. Gameplay and Vulkan validation remain pending; this stays WIP.

klimovich008 referenced this pull request 2026-11-13 19:20:37 +00:00

WIP: chore: restore 81 Hookshot PRs merged on GitHub after Longshot branched #209

All checks were successful

Hide checks

PR description / Description follows the template (pull_request_target) Successful in 4s

Details

This pull request has changes conflicting with the target branch.

• gpu/vk/vk_draw.cpp

Some workflows are waiting to be reviewed.

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title WIP: fix(vk): report native shader keys in draw statistics (#169)

Merge commit body Reviewed-on: https://git.magicbean.dev/MagicBeanDev/Longshot/pulls/169

WIP: fix(vk): report native shader keys in draw statistics (#169) Reviewed-on: https://git.magicbean.dev/MagicBeanDev/Longshot/pulls/169 Copy merge commit message

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u 'codex/longshot-draw-stats378:klimovich008-codex/longshot-draw-stats378'

git switch 'klimovich008-codex/longshot-draw-stats378'

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

area/accessibility

Barriers for people with disabilities

  

area/audio

Sound and music

  

area/input

Controllers, keyboard, mouse

  

area/install

Installing, updating, building from your game

  

area/menu

In-game menu and settings

  

area/renderer

Vulkan renderer, shaders, effects

  

area/saves

Save files

  

area/upscaling

DLSS, FSR, frame generation

  

good first issue

A good start for a new contributor

  

gpu/amd

AMD GPUs

  

gpu/igpu

Integrated GPUs

  

gpu/intel

Intel GPUs

  

gpu/nvidia

NVIDIA GPUs

  

help wanted

Extra hands or knowledge wanted

  

kind

bug

Something doesn't work as it should

  

kind

chore

Build, CI, dependencies, tidying

  

kind

docs

Documentation

  

kind

feature

A new feature or an improvement

  

kind

performance

Frame rate, frame time, loading, memory

  

kind

question

A question rather than a change

  

needs measurements

Waiting for before/after measurements

  

platform/linux

Linux only

  

platform/steam-deck

Steam Deck

  

platform/windows

Windows only

  

preview

Maintainers: deploy a preview of this PR's website (read its changes first). Removed after the run.

  

priority

critical

Crashes, data loss, or blocks most players

  

priority

high

Important: next in line

  

priority

low

Nice to have

  

status

blocked

Waits on something else first

  

status

confirmed

Reproduced or agreed on

  

status

duplicate

Already reported or proposed

  

status

invalid

Not a problem in this project

  

status

needs-info

Waiting for more information from the reporter

  

status

wontfix

Will not be worked on

  

testing wanted

Wanted: a test on other hardware (posts a test request in #test-requests)

No labels

area/accessibility

area/audio

area/input

area/install

area/menu

area/renderer

area/saves

area/upscaling

good first issue

gpu/amd

gpu/igpu

gpu/intel

gpu/nvidia

help wanted

kind

bug

kind

chore

kind

docs

kind

feature

kind

performance

kind

question

needs measurements

platform/linux

platform/steam-deck

platform/windows

preview

priority

critical

priority

high

priority

low

status

blocked

status

confirmed

status

duplicate

status

invalid

status

needs-info

status

wontfix

testing wanted

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

MagicBeanDev/Longshot!169

No description provided.