Skip to content
Snippets Groups Projects

vkd3d-shader/d3dbc: Use struct vkd3d_shader_instruction instead of struct sm1_instruction.

Merged Elizabeth Figura requested to merge zfigura/vkd3d:mr3 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
1989 1999 const struct vkd3d_shader_dst_param *dst = &instr->dst;
1990 const struct sm1_src_register *src = &instr->srcs[0];
2000 const struct vkd3d_shader_src_param *src = &instr->srcs[0];
1991 2001 unsigned int i;
1992 2002
1993 2003 if (instr->opcode != VKD3D_SM1_OP_MOV)
1994 2004 return false;
1995 2005 if (dst->modifiers != VKD3DSPDM_NONE)
1996 2006 return false;
1997 if (src->mod != VKD3DSPSM_NONE)
1998 return false;
1999 if (src->type != dst->reg.type)
2007 if (src->modifiers != VKD3DSPSM_NONE)
2000 2008 return false;
2001 if (src->reg != dst->reg.idx[0].offset)
2009 if (memcmp(&src->reg, &dst->reg, sizeof(src->reg)))
  • added 2 commits

    • 61cf4b4e - vkd3d-shader/d3dbc: Use struct vkd3d_shader_src_param instead of struct sm1_src_register.
    • 2b7268aa - vkd3d-shader/d3dbc: Use struct vkd3d_shader_instruction instead of struct sm1_instruction.

    Compare with previous version

  • Francisco Casas approved this merge request

    approved this merge request

  • Henri Verbeet approved this merge request

    approved this merge request

  • Henri Verbeet added 9 commits

    added 9 commits

    • 2b7268aa...c4f69f4d - 6 commits from branch wine:master
    • 1e430886 - vkd3d-shader/d3dbc: Use struct vkd3d_shader_dst_param instead of struct sm1_dst_register.
    • 77ac13e6 - vkd3d-shader/d3dbc: Use struct vkd3d_shader_src_param instead of struct sm1_src_register.
    • de615609 - vkd3d-shader/d3dbc: Use struct vkd3d_shader_instruction instead of struct sm1_instruction.

    Compare with previous version

  • Please register or sign in to reply
    Loading