Skip to content
Snippets Groups Projects

vkd3d-shader: Finish global variable and GEP support.

Merged Conor McCarthy requested to merge cmccarthy/vkd3d:dxil_gep2 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
  • Giovanni Mascellani
    Giovanni Mascellani @giomasce started a thread on an outdated change in commit 1759267c
  • 1931 1932 break;
    1932 1933 }
    1933 1934 }
    1935 else if (register_type == VKD3D_SM4_RT_IMMCONSTBUFFER)
    1936 {
    1937 if (param->idx_count != 1)
    1938 {
    1939 WARN("Unexpected idx count %u.\n", param->idx_count);
    1940 vkd3d_shader_parser_error(&priv->p, VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_INDEX_COUNT,
    1941 "Invalid index count %u for immediate const buffer register; expected count 1.", param->idx_count);
    1942 }
    1943 param->idx[1] = param->idx[0];
    1944 param->idx[0].offset = 0;
    1945 param->idx[0].rel_addr = NULL;
    1946 param->idx_count = 2;
    • Comment on lines +1943 to +1946

      This breaks the d3d-asm disassembly for TPF. Relatedly, at some point we might want to start having two different dialects for the disassembly: one that closely mimics native disassembly for D3DBC and TPF and another one that retains information that is relevant for developing VSIR, including showing the indices "hidden" from the standard disassembly and possibly showing indices in a more consistent fashion.

    • Conor McCarthy changed this line in version 3 of the diff

      changed this line in version 3 of the diff

    • Please register or sign in to reply
  • Conor McCarthy added 8 commits

    added 8 commits

    • a79f7cbf - vkd3d-shader/dxil: Implement the DXIL GEP instruction.
    • dad4a148 - vkd3d-shader/dxil: Implement the DXIL LOAD instruction.
    • 14d43183 - vkd3d-shader/spirv: Support declared component type and count in indexable temps.
    • 656ebe8f - vkd3d-shader/dxil: Support null constant arrays.
    • b713462c - vkd3d-shader/spirv: Support constant initialisers in indexable temps.
    • 7d89b1b7 - vkd3d-shader/spirv: Support declared component type and count in immediate constant buffers.
    • fd404e7d - vkd3d-shader: Add a register index to struct vkd3d_shader_immediate_constant_buffer.
    • 252670fe - vkd3d-shader/dxil: Emit constant global arrays as immediate constant buffers.

    Compare with previous version

  • Conor McCarthy added 11 commits

    added 11 commits

    • 92aa4d8c - 1 earlier commit
    • f6260d2f - vkd3d-shader/dxil: Introduce a value type for immediate constant buffers.
    • 430af843 - vkd3d-shader/dxil: Support global variable initialisers.
    • de7de7df - vkd3d-shader/dxil: Implement the DXIL GEP instruction.
    • 4d420beb - vkd3d-shader/dxil: Implement the DXIL LOAD instruction.
    • 0c100be3 - vkd3d-shader/spirv: Support declared component type and count in indexable temps.
    • bc382ec4 - vkd3d-shader/dxil: Support null constant arrays.
    • e5f220a7 - vkd3d-shader/spirv: Support constant initialisers in indexable temps.
    • 015524e2 - vkd3d-shader/spirv: Support declared component type and count in immediate constant buffers.
    • 8839e451 - vkd3d-shader: Add a register index to struct vkd3d_shader_immediate_constant_buffer.
    • 67b185ba - vkd3d-shader/dxil: Emit constant global arrays as immediate constant buffers.

    Compare with previous version

  • Conor McCarthy added 29 commits

    added 29 commits

    • 67b185ba...beb3f6e0 - 23 commits from branch wine:master
    • 4def699f - vkd3d-shader/spirv: Support declared component type and count in indexable temps.
    • 40cb56b2 - vkd3d-shader/dxil: Support null constant arrays.
    • 40385d32 - vkd3d-shader/spirv: Support constant initialisers in indexable temps.
    • e653aaad - vkd3d-shader/spirv: Support declared component type and count in immediate constant buffers.
    • 3f3c6256 - vkd3d-shader: Add a register index to struct vkd3d_shader_immediate_constant_buffer.
    • 985a6fcb - vkd3d-shader/dxil: Emit constant global arrays as immediate constant buffers.

    Compare with previous version

  • Conor McCarthy marked this merge request as ready

    marked this merge request as ready

  • Conor McCarthy changed the description

    changed the description

  • Giovanni Mascellani approved this merge request

    approved this merge request

  • Conor McCarthy mentioned in merge request !498 (merged)

    mentioned in merge request !498 (merged)

  • Conor McCarthy added 2 commits

    added 2 commits

    • 53c19f5e - vkd3d-shader: Add a register index to struct vkd3d_shader_immediate_constant_buffer.
    • 4495420e - vkd3d-shader/dxil: Emit constant global arrays as immediate constant buffers.

    Compare with previous version

  • Author Developer

    A test of a non-zero constant buffer offset is needed but this MR already has 6 commits.

  • Henri Verbeet approved this merge request

    approved this merge request

  • Alexandre Julliard added 36 commits

    added 36 commits

    • 4495420e...0c33f82f - 30 commits from branch wine:master
    • 69c3946c - vkd3d-shader/spirv: Support declared component type and count in indexable temps.
    • ffae57eb - vkd3d-shader/dxil: Support null constant arrays.
    • 16cb6fdb - vkd3d-shader/spirv: Support constant initialisers in indexable temps.
    • ef940cb7 - vkd3d-shader/spirv: Support declared component type and count in immediate constant buffers.
    • cb88844a - vkd3d-shader: Add a register index to struct vkd3d_shader_immediate_constant_buffer.
    • cc5e7038 - vkd3d-shader/dxil: Emit constant global arrays as immediate constant buffers.

    Compare with previous version

  • Alexandre Julliard approved this merge request

    approved this merge request

  • Please register or sign in to reply
    Loading