Skip to content
Snippets Groups Projects

hlsl: Replace bare list pointers with hlsl_block, part 4.

Merged Elizabeth Figura requested to merge zfigura/vkd3d:pr1 into master

Merge request reports

Merge request pipeline #12791 skipped

Merge request pipeline skipped for d52eb859

Approved by

Merged by Alexandre JulliardAlexandre Julliard 1 year ago (Jul 20, 2023 8:58pm UTC)

Merge details

  • Changes merged into master with d52eb859.
  • Did not delete the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • added 1 commit

    • 93eeebb1 - vkd3d-shader/hlsl: Use a hlsl_block to build replacement instructions in lower_int_division().

    Compare with previous version

  • Author Developer

    Giovanni pointed out off-list that the new version now leaks instructions on error paths.

    In order to resolve that I've shuffled things around in my local branch—4/5 is removed from this series (I'll send it separately later) and 5/5 is combined with a later patch I had that introduces a lower_ir() helper, which takes care of a bit more of the hlsl_block boilerplate. This lower_ir() helper ends up being useful for pretty much every lowering pass, of which we have quite a lot.

  • Giovanni Mascellani approved this merge request

    approved this merge request

  • Henri Verbeet approved this merge request

    approved this merge request

  • Alexandre Julliard added 28 commits

    added 28 commits

    • 93eeebb1...c0a2bb10 - 24 commits from branch wine:master
    • 77e1c589 - vkd3d-shader/hlsl: Return a hlsl_block from the "primary_expr" rule.
    • 54bd6f7b - vkd3d-shader/hlsl: Return a hlsl_block from the "declaration_statement" rule.
    • cdabe172 - vkd3d-shader/hlsl: Return a hlsl_block from the "declaration" and "struct_declaration" rules.
    • d52eb859 - vkd3d-shader/hlsl: Use a hlsl_block to build replacement instructions in lower_int_division().

    Compare with previous version

  • Alexandre Julliard approved this merge request

    approved this merge request

Please register or sign in to reply
Loading