MagicBeanDev/Longshot

Watch

Fork 43

test(vk): the texture staging check's fixture has the log levels the cut code logs at #215

Closed

TrashPanda wants to merge 1 commit from TrashPanda/Longshot:test/texture-staging-log-levels into main

TrashPanda commented

2026-11-13 14:46:02 +00:00

Contributor

Why

tests/test_texture_staging_publication.py fails on main wherever Vulkan headers are found: the code it cuts from vk_texture.cpp logs through logf_at(log_debug, ...) since the log levels (#177), and its fixture only has logf. Without headers the check is skipped, so CI does not see it.

What changed

tests: tests/texture_staging_publication_test.cpp gets the LogLevel enum and a logf_at stand-in, as in gpu/vk/vk_internal.h.

Flags and settings

None

Measurements

main: 2331f46c (2026-11-13)
this PR: test/texture-staging-log-levels @ b9c5c733

No speed numbers: a test fixture only. The check's result on both sides:

	main @ `2331f46c`	this PR @ `b9c5c733`
`tests/test_texture_staging_publication.py` (Vulkan headers found)	fails to build	passes

Testing

Tested: python -I -B tests/run_all.py texture_staging_publication on Linux (CachyOS, Python 3.14, Khronos Vulkan-Headers): fails on main @ 2331f46c ('logf_at' was not declared in this scope), passes on this branch.

Not tested: nothing else: no game code changes.

Needs other testers: None

Screenshots

Nothing on screen

Risk and rollback

None: only the check's fixture changes. Reverting the commit is enough.

Reviewer notes

Found while porting the Hookshot PRs in #209, which names it as one of the failures shared with main.

Issues

See #209

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. (Not applicable: a fixture fix.)
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.
A check under tests/ that reads changed source updated in this PR, not weakened.

## Why `tests/test_texture_staging_publication.py` fails on `main` wherever Vulkan headers are found: the code it cuts from `vk_texture.cpp` logs through `logf_at(log_debug, ...)` since the log levels (#177), and its fixture only has `logf`. Without headers the check is skipped, so CI does not see it. ## What changed - tests: `tests/texture_staging_publication_test.cpp` gets the `LogLevel` enum and a `logf_at` stand-in, as in `gpu/vk/vk_internal.h`. ## Flags and settings None ## Measurements main: 2331f46c (2026-11-13) this PR: test/texture-staging-log-levels @ b9c5c733 No speed numbers: a test fixture only. The check's result on both sides: | | main @ 2331f46c | this PR @ b9c5c733 | |---|---|---| | `tests/test_texture_staging_publication.py` (Vulkan headers found) | fails to build | passes | ## Testing **Tested:** `python -I -B tests/run_all.py texture_staging_publication` on Linux (CachyOS, Python 3.14, Khronos Vulkan-Headers): fails on `main` @ `2331f46c` (`'logf_at' was not declared in this scope`), passes on this branch. **Not tested:** nothing else: no game code changes. **Needs other testers:** None ## Screenshots Nothing on screen ## Risk and rollback None: only the check's fixture changes. Reverting the commit is enough. ## Reviewer notes Found while porting the Hookshot PRs in #209, which names it as one of the failures shared with `main`. ## Issues See #209 ## 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). - [x] Measured: main and this PR at named commits, on the same PC, scene and settings, at least 2 interleaved runs each, the median reported. (Not applicable: a fixture fix.) - [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] A check under `tests/` that reads changed source updated in this PR, not weakened.

TrashPanda added 1 commit

2026-11-13 14:46:02 +00:00

test(vk): the texture staging check's fixture has the log levels the cut code logs at

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

Details

CI / Conventional Commit title (pull_request) Has been cancelled

Details

CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Has been cancelled

Details

CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Has been cancelled

Details

CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Has been cancelled

Details

CI / Workflow lint (actionlint) (pull_request) Has been cancelled

Details

Third-party parts / As their notes say (pull_request) Has been cancelled

Details

Third-party parts / The same as upstream (pull_request) Has been cancelled

Details

b9c5c73375

The cut of vk_texture.cpp calls logf_at(log_debug, ...) since the log levels (#177), and the fixture had only logf:
the check failed to build wherever Vulkan headers are found (it is skipped without them).

Assisted-by: Claude Opus 5.5

TrashPanda referenced this pull request

2026-11-13 14:46:08 +00:00

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

TrashPanda referenced this pull request

2026-11-13 14:49:15 +00:00

WIP: perf(vk): walk the captured ranges once a scan, not a binary search a page #216

TrashPanda commented

2026-11-13 15:08:23 +00:00

Author

Contributor

This duplicates @dyst's #202, which was opened first and makes the same change (LogLevel and a logf_at stub in tests/texture_staging_publication_test.cpp), and has also been run on Windows. Please take #202; this one can be closed. I opened it before checking the open PRs for the same failure.

This duplicates @dyst's #202, which was opened first and makes the same change (`LogLevel` and a `logf_at` stub in `tests/texture_staging_publication_test.cpp`), and has also been run on Windows. Please take #202; this one can be closed. I opened it before checking the open PRs for the same failure.

~~TrashPanda referenced this pull request 2026-11-13 15:16:57 +00:00~~

WIP: fix(security): shared files, links and lists can't make the game, Builder or tools write or read where they shouldn't #218

HumanBean reviewed

2026-11-13 16:17:39 +00:00

HumanBean left a comment

This duplicates #202, which makes the same change, so keep #202 and close this one.

All three PRs (#195, #202 and #215) add the same LogLevel enum and logf_at stub, and all match gpu/vk/vk_internal.h:36-37 exactly, so this code is correct too. 202 is the one to keep because it has the most thorough testing (Windows and Linux, plain and sanitized) and a description that names the call site correctly (staging() in gpu/vk/vk_texture.cpp).

This duplicates https://git.magicbean.dev/MagicBeanDev/Longshot/pulls/202, which makes the same change, so keep https://git.magicbean.dev/MagicBeanDev/Longshot/pulls/202 and close this one. All three PRs (https://git.magicbean.dev/MagicBeanDev/Longshot/pulls/195, https://git.magicbean.dev/MagicBeanDev/Longshot/pulls/202 and https://git.magicbean.dev/MagicBeanDev/Longshot/pulls/215) add the same `LogLevel` enum and `logf_at` stub, and all match `gpu/vk/vk_internal.h:36-37` exactly, so this code is correct too. 202 is the one to keep because it has the most thorough testing (Windows and Linux, plain and sanitized) and a description that names the call site correctly (`staging()` in `gpu/vk/vk_texture.cpp`).