Fix merge conflict in PR #79 (verbose disasm opt-in) - #80
Merged
Conversation
When reading registers, the logic is different than when writing them; we know if thing are fx10 or not from a dedicated bit, and the subreg doesn't matter for fp20; both subregs are written.
The output of this program is often quite verbose. This lets us enable parts of the output case by case, or all at once.
# Conflicts: # src/libcgc/shader.c Co-authored-by: digetx <1242749+digetx@users.noreply.github.com>
Copilot created this pull request from a session on behalf of
digetx
September 1, 2026 13:58
View session
digetx
approved these changes
Sep 1, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Resolves the merge conflict that prevents #79 ("make verbose disasm opt-in") from being merged cleanly into
master.Changes
kusma:verbose-output(PR make verbose disasm opt-in #79, commitf90a935) into this branch.src/libcgc/shader.c: two overlapping hunks incgc_shader_dumpwhere master's copy of the function (unmodified since the PR's base) collided with PR make verbose disasm opt-in #79's flag-gated rewrite. Resolved by taking PR make verbose disasm opt-in #79's version, which is functionally identical to the PR's intended change.tools/cgc.cauto-merged cleanly with no manual changes needed.Validation
shader.cagainst PR make verbose disasm opt-in #79's version — identical except for unrelated pre-existing differences already onmaster(removal ofHAVE_CONFIG_Hblock,alu_sched/mfu_schedarray size).src/libcgc/shader.candtools/cgc.cwithgcc -fsyntax-only(fullmeson/ninjabuild not possible in this sandbox due to missinglibdrmdependency).Note
This PR does not merge #79 itself (which lives on a fork I can't push to); it provides a conflict-free version of the same change for a maintainer to merge, after which #79 can be closed.