Skip to content
Snippets Groups Projects

vkd3d-shader/spirv: Declare descriptors from the scanned descriptor info.

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

Merge request reports

Merge request pipeline #14178 skipped

Merge request pipeline skipped for 9624e2f9

Merged by Alexandre JulliardAlexandre Julliard 1 year ago (Aug 28, 2023 8:16pm UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • +    const struct vkd3d_shader_register reg =
    +    {
    +        .type = VKD3DSPR_SAMPLER,
    +        .idx[0].offset = register_id,
    +        .idx_count = 1,
    +    };

    This is hardly the only place that does something like this, but could we please start using shader_register_init() or helpers built on top of that? Mainly to make life slightly easier for people touching struct vkd3d_shader_register in the future, of course.

  • Henri Verbeet approved this merge request

    approved this merge request

  • Alexandre Julliard added 19 commits

    added 19 commits

    • 23e54d8e...18c14774 - 15 commits from branch wine:master
    • a1e10e5c - vkd3d-shader/spirv: Split spirv_compiler_has_combined_sampler() into two functions.
    • 547768bc - vkd3d-shader/spirv: Declare samplers from the descriptor info.
    • e8b35612 - vkd3d-shader/spirv: Declare constant buffers from the descriptor info.
    • 9624e2f9 - vkd3d-shader/spirv: Declare SRVs and UAVs from the descriptor info.

    Compare with previous version

  • Alexandre Julliard approved this merge request

    approved this merge request

  • Author Developer

    This is hardly the only place that does something like this, but could we please start using shader_register_init() or helpers built on top of that? Mainly to make life slightly easier for people touching struct vkd3d_shader_register in the future, of course.

    Sure, will do in the future. I was not particularly aware of those helpers.

    In this case we may want to not be passing vkd3d_shader_register down at all, but I'm not sure. It's not quite clear how to avoid it, anyway.

Please register or sign in to reply
Loading