Skip to content
Snippets Groups Projects

spirv: Remove some code no longer used after I/O normalization.

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

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Subject: [PATCH 1/2] vkd3d-shader/spirv: Remove the no longer used
     spirv_compiler_emit_hull_shader_barrier().

    It's true that this is effectively unused now, but it's not clear to me that we have an equivalent barrier anywhere. I.e., does this being unused indicate a (potentially hard to debug) bug, instead of simply being some leftover code?

  • Elizabeth Figura added 4 commits

    added 4 commits

    • 8acac554 - vkd3d-shader/ir: Pass a vkd3d_shader_parser to instruction_array_normalise_io_registers().
    • 8d6adae1 - vkd3d-shader/ir: Check for vocp usage during IR normalization.
    • 30676187 - vkd3d-shader/spirv: Remove handling of VKD3DSPR_OUTCONTROLPOINT.
    • d9d08f75 - vkd3d-shader/spirv: No longer handle builtin array size mismatch in spirv_compiler_emit_input().

    Compare with previous version

  • Author Developer

    It's true that this is effectively unused now, but it's not clear to me that we have an equivalent barrier anywhere. I.e., does this being unused indicate a (potentially hard to debug) bug, instead of simply being some leftover code?

    After struggling to understand tessellation again, I believe the answer is yes. I've pushed a new version that moves the check for vocp into the normalization pass and stores it in the vsir shader desc. Alternate approaches work, though, so let me know if you prefer a different way of detecting this case.

  • Elizabeth Figura added 31 commits

    added 31 commits

    • d9d08f75...8e5c8c17 - 27 commits from branch wine:master
    • 40869d4d - vkd3d-shader/ir: Pass a vkd3d_shader_parser to instruction_array_normalise_io_registers().
    • 502f05b1 - vkd3d-shader/ir: Check for vocp usage during IR normalization.
    • 7c727aa9 - vkd3d-shader/spirv: Remove handling of VKD3DSPR_OUTCONTROLPOINT.
    • 20059ee6 - vkd3d-shader/spirv: No longer handle builtin array size mismatch in spirv_compiler_emit_input().

    Compare with previous version

  • Author Developer

    And rebased on top of master.

  • Seems fine to me like this, but note that this is failing CI on Windows; possibly because it's still missing Giovanni's commit ca7fa0c0.

  • Elizabeth Figura added 15 commits

    added 15 commits

    • 20059ee6...ecdc3f39 - 11 commits from branch wine:master
    • fd25fbf7 - vkd3d-shader/ir: Pass a vkd3d_shader_parser to instruction_array_normalise_io_registers().
    • 54bfbf82 - vkd3d-shader/ir: Check for vocp usage during IR normalization.
    • e452b5cc - vkd3d-shader/spirv: Remove handling of VKD3DSPR_OUTCONTROLPOINT.
    • 3d0dd5a7 - vkd3d-shader/spirv: No longer handle builtin array size mismatch in spirv_compiler_emit_input().

    Compare with previous version

  • Author Developer

    Seems fine to me like this, but note that this is failing CI on Windows; possibly because it's still missing Giovanni's commit ca7fa0c0.

    Rebased on top of master again, then.

  • Henri Verbeet approved this merge request

    approved this merge request

  • Alexandre Julliard added 20 commits

    added 20 commits

    • 3d0dd5a7...7419f4e3 - 16 commits from branch wine:master
    • 8b42f523 - vkd3d-shader/ir: Pass a vkd3d_shader_parser to instruction_array_normalise_io_registers().
    • b73d2c97 - vkd3d-shader/ir: Check for vocp usage during IR normalization.
    • fa23165c - vkd3d-shader/spirv: Remove handling of VKD3DSPR_OUTCONTROLPOINT.
    • f05be8ff - vkd3d-shader/spirv: No longer handle builtin array size mismatch in spirv_compiler_emit_input().

    Compare with previous version

  • Alexandre Julliard approved this merge request

    approved this merge request

Please register or sign in to reply
Loading