fix(vk): the Intel shader compiles row's hint names the launcher when RX_VK_NO_INTEL_SERIAL holds it #781

Open
Yeetbot90 wants to merge 1 commit from Yeetbot90/Longshot:fix/intel-compiles-hint-launcher into main
Contributor

Type: fix · Risk: low · Tested on: Windows 11, RX 9070 XT (game-free checks only) · Needs: Windows, Intel GPU

Why

The Longshot Launcher's build settings are getting an Intel shader compiles choice (MagicBeanDev/LongshotLauncher#97). On Side by side, the launcher starts the build and the game with RX_VK_NO_INTEL_SERIAL=1. The game's Intel shader compiles row is then held by that variable, and its hint says "remove that line to choose here". A player who chose Side by side in the launcher has no line to find, so the hint now names the launcher's setting first.

How to reproduce

Seen on: Windows, Intel graphics (the row is shown only there); read from the source on Windows 11, RX 9070 XT
Settings and switches: RX_VK_NO_INTEL_SERIAL=1 in the environment, as the launcher sets it for Side by side
Steps: start the game, open the Insert menu's Debug tab, and select the Intel shader compiles row
Expected: the hint says where the setting comes from, the launcher's build settings included
Actual: "Set by RX_VK_NO_INTEL_SERIAL (longshot_env.txt or the environment): remove that line to choose here."

What changed

The hint the Intel shader compiles row shows while RX_VK_NO_INTEL_SERIAL holds it now names the launcher's build settings. The README's Intel section says the launcher sets the variable.

  • menu: hn_intel_compiles() in gpu/vk/vk_menu.cpp, the variant shown while the variable is set. The row's own two hints are unchanged.
  • README: the Intel laptops section's paragraph on the row.

Measurements

Nothing to measure: one menu hint's text and a README paragraph.

Flags and settings

None: RX_VK_NO_INTEL_SERIAL and the row work as before; only the hint's text changes.

Testing

Tested: python -I -B tests/run_all.py on Windows 11, RX 9070 XT: 540 passed, 18 failed, 35 skipped. The same 18 fail on main @ aa95d35f on this PC (this Python lacks modules several checks need, e.g. test_release.py, test_make_game_cache.py, test_linux_preflight.py). No check reads this hint's text (test_damage_debug_menu.py stubs hn_intel_compiles).

Not tested: the hint on screen. The row is shown only on Intel graphics on Windows, and this PC has none.

Must be tested:

  • Windows, Intel GPU: start the game with RX_VK_NO_INTEL_SERIAL=1 (or from a launcher build with Intel shader compiles on Side by side), open the Insert menu's Debug tab and select Intel shader compiles, expecting the row on Side by side, held, and the hint naming the launcher's build settings (by hand: the hint line under the menu)

Risks

What could break: nothing beyond the hint's text; it is one string, wrapped by the menu like the others.

Turning it off: revert the commit.

Compatibility: Nothing changes.

Checklist

Everyone

  • One topic.
  • The title is a Conventional Commit (type(scope): description) of the status line's type.
  • Why gives the reason plainly and links the issues that fit (the tracker searched).
  • Measurements has a verdict, or one line saying why there is nothing to measure.
  • Testing names what was tested, what wasn't, and what must still be tested, where and how.
  • Rebased on current main.
  • python -I -B tests/run_all.py passes (any failure that also fails on main is named).
  • 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.

When it applies

  • AI assistance recorded with Assisted-by: / Co-Authored-By: trailers.
  • Docs updated.
**Type:** fix · **Risk:** low · **Tested on:** Windows 11, RX 9070 XT (game-free checks only) · **Needs:** Windows, Intel GPU ## Why The Longshot Launcher's build settings are getting an **Intel shader compiles** choice ([MagicBeanDev/LongshotLauncher#97](https://git.magicbean.dev/MagicBeanDev/LongshotLauncher/pulls/97)). On Side by side, the launcher starts the build and the game with `RX_VK_NO_INTEL_SERIAL=1`. The game's Intel shader compiles row is then held by that variable, and its hint says "remove that line to choose here". A player who chose Side by side in the launcher has no line to find, so the hint now names the launcher's setting first. ## How to reproduce **Seen on:** Windows, Intel graphics (the row is shown only there); read from the source on Windows 11, RX 9070 XT **Settings and switches:** `RX_VK_NO_INTEL_SERIAL=1` in the environment, as the launcher sets it for Side by side **Steps:** start the game, open the Insert menu's Debug tab, and select the Intel shader compiles row **Expected:** the hint says where the setting comes from, the launcher's build settings included **Actual:** "Set by RX_VK_NO_INTEL_SERIAL (longshot_env.txt or the environment): remove that line to choose here." ## What changed The hint the Intel shader compiles row shows while `RX_VK_NO_INTEL_SERIAL` holds it now names the launcher's build settings. The README's Intel section says the launcher sets the variable. - menu: `hn_intel_compiles()` in `gpu/vk/vk_menu.cpp`, the variant shown while the variable is set. The row's own two hints are unchanged. - README: the Intel laptops section's paragraph on the row. ## Measurements Nothing to measure: one menu hint's text and a README paragraph. ### Flags and settings None: `RX_VK_NO_INTEL_SERIAL` and the row work as before; only the hint's text changes. ## Testing **Tested:** `python -I -B tests/run_all.py` on Windows 11, RX 9070 XT: 540 passed, 18 failed, 35 skipped. The same 18 fail on `main` @ aa95d35f on this PC (this Python lacks modules several checks need, e.g. `test_release.py`, `test_make_game_cache.py`, `test_linux_preflight.py`). No check reads this hint's text (`test_damage_debug_menu.py` stubs `hn_intel_compiles`). **Not tested:** the hint on screen. The row is shown only on Intel graphics on Windows, and this PC has none. **Must be tested:** - Windows, Intel GPU: start the game with `RX_VK_NO_INTEL_SERIAL=1` (or from a launcher build with Intel shader compiles on Side by side), open the Insert menu's Debug tab and select Intel shader compiles, expecting the row on Side by side, held, and the hint naming the launcher's build settings (by hand: the hint line under the menu) ## Risks **What could break:** nothing beyond the hint's text; it is one string, wrapped by the menu like the others. **Turning it off:** revert the commit. **Compatibility:** Nothing changes. ## Checklist ### Everyone - [x] One topic. - [x] The title is a Conventional Commit (`type(scope): description`) of the status line's type. - [x] Why gives the reason plainly and links the issues that fit (the tracker searched). - [x] Measurements has a verdict, or one line saying why there is nothing to measure. - [x] Testing names what was tested, what wasn't, and what must still be tested, where and how. - [x] Rebased on current `main`. - [x] `python -I -B tests/run_all.py` passes (any failure that also fails on `main` is named). - [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. ### When it applies - [x] AI assistance recorded with `Assisted-by:` / `Co-Authored-By:` trailers. - [x] Docs updated.
fix(vk): the Intel shader compiles row's hint names the launcher when RX_VK_NO_INTEL_SERIAL holds it
Some checks are pending
CI / Conventional Commit title (pull_request) Blocked by required conditions
CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Blocked by required conditions
CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Blocked by required conditions
CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Blocked by required conditions
CI / Workflow lint (actionlint) (pull_request) Blocked by required conditions
Guide screenshots / Guide images and local UI source review (pull_request) Blocked by required conditions
Third-party parts / The same as upstream (pull_request) Blocked by required conditions
Third-party parts / As their notes say (pull_request) Blocked by required conditions
PR description / Description follows the template (pull_request_target) Successful in 5s
Website / Website on Cloudflare (pull_request_target) Has been skipped
3e74b5bc19
The Longshot Launcher's build settings set RX_VK_NO_INTEL_SERIAL=1 for the build and the game on Side by side (MagicBeanDev/LongshotLauncher#97). The row's hint said to remove a line, which a player who chose it in the launcher has nowhere to find.

Co-authored-by: Cursor <[email protected]>
Owner

This conflicts with main now: README.md and gpu/vk/vk_menu.cpp. #500 made the Intel shader compiles row's default Auto (side by side on the Arc B-series, one at a time elsewhere) and rewrote that row's hints and the README paragraph, and #550 touched the menu next to it. The launcher sentence needs to fit that new wording, so I haven't resolved it for you. Could you rebase onto current main?

This conflicts with `main` now: `README.md` and `gpu/vk/vk_menu.cpp`. [#500](https://git.magicbean.dev/MagicBeanDev/Longshot/pulls/500) made the Intel shader compiles row's default Auto (side by side on the Arc B-series, one at a time elsewhere) and rewrote that row's hints and the README paragraph, and [#550](https://git.magicbean.dev/MagicBeanDev/Longshot/pulls/550) touched the menu next to it. The launcher sentence needs to fit that new wording, so I haven't resolved it for you. Could you rebase onto current `main`?
Some checks are pending
CI / Conventional Commit title (pull_request) Blocked by required conditions
CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Blocked by required conditions
CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Blocked by required conditions
CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Blocked by required conditions
CI / Workflow lint (actionlint) (pull_request) Blocked by required conditions
Guide screenshots / Guide images and local UI source review (pull_request) Blocked by required conditions
Third-party parts / The same as upstream (pull_request) Blocked by required conditions
Third-party parts / As their notes say (pull_request) Blocked by required conditions
PR description / Description follows the template (pull_request_target) Successful in 5s
Website / Website on Cloudflare (pull_request_target) Has been skipped
This pull request has changes conflicting with the target branch.
  • README.md
  • gpu/vk/vk_menu.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.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u 'fix/intel-compiles-hint-launcher:Yeetbot90-fix/intel-compiles-hint-launcher'
git switch 'Yeetbot90-fix/intel-compiles-hint-launcher'
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
2 participants
Notifications
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!781
No description provided.