Skip to content
Snippets Groups Projects

vkd3d-shader/d3dbc: Use enum vkd3d_shader_dst_modifier in struct sm1_dst_register.

Merged Henri Verbeet requested to merge hverbeet/vkd3d:for_upstream_0 into master
1 unresolved thread

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
1923 1923 static void write_sm1_dst_register(struct vkd3d_bytecode_buffer *buffer, const struct sm1_dst_register *reg)
1924 1924 {
1925 1925 VKD3D_ASSERT(reg->writemask);
1926 put_u32(buffer, (1u << 31) | sm1_encode_register_type(reg->type) | reg->mod | (reg->writemask << 16) | reg->reg);
1926 put_u32(buffer, VKD3D_SM1_INSTRUCTION_PARAMETER
1927 | sm1_encode_register_type(reg->type)
1928 | (reg->mod << VKD3D_SM1_DST_MODIFIER_SHIFT)
  • Giovanni Mascellani approved this merge request

    approved this merge request

  • Author Maintainer

    I guess that means that it was buggy before, right? mod was not shifted.

    No, there's actually some subtlety there: D3DSHADER_PARAM_DSTMOD_TYPE (and D3DSHADER_PARAM_SRCMOD_TYPE) values are pre-shifted, while vkd3d_shader_dst_modifier and vkd3d_shader_src_modifier values aren't.

  • Henri Verbeet approved this merge request

    approved this merge request

  • Henri Verbeet added 28 commits

    added 28 commits

    • dc858afa...b31c9831 - 27 commits from branch wine:master
    • f3e6c75c - vkd3d-shader/d3dbc: Use enum vkd3d_shader_dst_modifier in struct sm1_dst_register.

    Compare with previous version

  • Please register or sign in to reply
    Loading