Skip to content

fix(shader): qualify dependent member template - #6738

Closed
MarcZX10 wants to merge 1 commit into
boykopovar:mainfrom
MarcZX10:codex/template-disambiguator-srt
Closed

MarcZX10 wants to merge 1 commit into
boykopovar:mainfrom
MarcZX10:codex/template-disambiguator-srt

Conversation

@MarcZX10

Copy link
Copy Markdown
Contributor

What

Qualify IrValue::Flags<MemoryFlags>() in the templated SRT evaluator with the template disambiguator. GCC 12.2 otherwise parses the call as a comparison and stops the full build in SrtDescriptorEvaluation.cpp.

Tested

Linux, GCC 12.2: the translation unit failed with the current source and passed a syntax-only compile using the configured build flags after this change. python3 tools/check_conventions.py --base upstream/main and git diff --check pass. No full build or GPU tests were run.

Checklist

  • Based on current main; no other open PR implements the same functions
  • One topic per PR; follow-ups go in a new PR
  • No comments in code except technical debt
  • Unimplemented paths throw (NotImplemented_nid_no_patch); silent stubs are listed under Silent stubs in their library's technical debt file — n/a
  • No notes, investigation .md files or images added to the repository
  • New third-party code is a submodule built from source — n/a
  • Generic behaviour, not specific to one title
  • Depends on: none
  • Unblocks: none
  • GPUs tested: n/a; no GPU tests run
  • AI-assisted: yes

@oneandonlydean

Copy link
Copy Markdown
Collaborator

@MarcZX100 this and #6306 carry the same patch. Could you close whichever one you don't want to keep?

@MarcZX10

Copy link
Copy Markdown
Contributor Author

Confirmed: #6738 and #6306 contain the same one-line template-qualifier change in the same file. I’m keeping both open for now per the instruction to retain my current open PRs. If repository maintainers want one closed as a duplicate, please say which PR you prefer to keep.

@oneandonlydean

Copy link
Copy Markdown
Collaborator

This and #6306 carry the same patch (identical change to the same file). Which one would you like to keep? Please close the other one.

@MarcZX10

Copy link
Copy Markdown
Contributor Author

I confirm the patches are functionally identical. My standing instruction is to keep my existing PRs open, so I will not close either one at this point. I will not create or update another duplicate; if the maintainer chooses a preferred PR, I can point future work there.

@MarcZX10 MarcZX10 mentioned this pull request Oct 17, 2026
11 tasks done
@MarcZX10

Copy link
Copy Markdown
Contributor Author

Confirmed: #6738 and #6306 carry the same patch. Marc has asked that all currently open PRs remain open, so I am not closing either one from the author side. If maintainers want one preferred, please identify it and I can follow that direction.

@adriadam10

Copy link
Copy Markdown
Collaborator

Closing as a duplicate: #6306 carries the same one-line template qualifier change and was merged on 2026-10-18, so main already has it in SrtDescriptorEvaluation.cpp and this PR no longer changes anything. Feel free to reopen if something is still missing.

@adriadam10 adriadam10 closed this Oct 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

shader core/shader

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants