Skip to content
Snippets Groups Projects

vkd3d-shader: Separate sm1 register types in vsir.

Merged Elizabeth Figura requested to merge zfigura/vkd3d:mr3 into master
3 unresolved threads

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
1159
1160 case VKD3DSPR_SSA:
1161 vkd3d_string_buffer_printf(buffer, "sr");
1162 break;
1163
1164 case VKD3DSPR_WAVELANECOUNT:
1165 vkd3d_string_buffer_printf(buffer, "vWaveLaneCount");
1166 break;
1167
1168 case VKD3DSPR_WAVELANEINDEX:
1169 vkd3d_string_buffer_printf(buffer, "vWaveLaneIndex");
1170 break;
1037 /* fall through */
1171 1038
1172 1039 case VKD3DSPR_PARAMETER:
1173 1040 vkd3d_string_buffer_printf(buffer, "parameter");
  • Francisco Casas
    Francisco Casas @fcasas started a thread on commit 8f68bcc6
  • 505 506 switch (reg_type)
    506 507 {
    507 508 case VKD3DSPR_DEPTHOUT:
    509 case VKD3DSPR_ADDR:
    508 510 return 0;
    • Comment on lines +509 to 510

      Unrelated but I thought worth pointing out: From the documentation it seems that VKD3DSPR_PREDICATE (p0) and VKD3DSPR_LOOP (aL) also fall in this category, also it seems that VKD3DSPR_LOOP should not be printing index in shader_print_register().

    • Yes, I think this one was only because I happened to be touching it already.

    • Please register or sign in to reply
  • Francisco Casas
    Francisco Casas @fcasas started a thread on commit 38dd273a
  • 540 541
    541 542 if (sm1_type == VKD3D_SM1_REG_ADDR)
    542 543 return sm1->p.program->shader_version.type == VKD3D_SHADER_TYPE_PIXEL ? VKD3DSPR_TEXTURE : VKD3DSPR_ADDR;
    544 if (sm1_type == VKD3D_SM1_REG_TEXCRDOUT)
    545 return vkd3d_shader_ver_ge(&sm1->p.program->shader_version, 3, 0) ? VKD3DSPR_OUTPUT : VKD3DSPR_TEXCRDOUT;
  • I didn't review in detail, but from a VSIR point of view the changes are certainly welcome.

  • added 4 commits

    • cbc784af - vkd3d-shader/d3d_asm: Define register names in a table.
    • 81966c38 - vkd3d-shader/d3dbc: Separate VKD3DSPR_ADDR and VKD3DSPR_TEXTURE.
    • 437fa85c - vkd3d-shader/d3dbc: Separate VKD3DSPR_OUTPUT and VKD3DSPR_TEXCRDOUT.
    • fddad9d6 - vkd3d-shader/d3dbc: Factor out a sm1_register_init() helper.

    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 33 commits

    added 33 commits

    • fddad9d6...dd450c52 - 27 commits from branch wine:master
    • 11861791 - vkd3d-shader: Explicitly translate between d3dbc and vsir register types.
    • 65f3f56f - vkd3d-shader/d3dbc: Normalize to a single VKD3DSPR_CONST register set when reading.
    • 0df5dea6 - vkd3d-shader/d3d-asm: Define register names in a table.
    • 8132239e - vkd3d-shader/ir: Separate VKD3DSPR_ADDR and VKD3DSPR_TEXTURE.
    • 3c532930 - vkd3d-shader/ir: Separate VKD3DSPR_OUTPUT and VKD3DSPR_TEXCRDOUT.
    • d164752e - vkd3d-shader/d3dbc: Introduce d3dbc_parse_register().

    Compare with previous version

  • Please register or sign in to reply
    Loading