Skip to content
Snippets Groups Projects

hlsl: Matrix majority, 2023 edition.

Merged Elizabeth Figura requested to merge zfigura/vkd3d:pr0 into master
2 unresolved threads

Merge request reports

Merge request pipeline #7788 skipped

Merge request pipeline skipped for 6767b7ab

Merged by Alexandre JulliardAlexandre Julliard 2 years ago (Feb 20, 2023 9:45pm 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
903 903 else
904 904 default_majority = HLSL_MODIFIER_ROW_MAJOR;
905 905 }
906 else if (type->type != HLSL_CLASS_MATRIX && (*modifiers & HLSL_MODIFIERS_MAJORITY_MASK))
907 {
908 hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER,
909 "'row_major' and 'column_major' modifiers are only allowed for matrices.");
910 }
  • Giovanni Mascellani
  • 2040 2040 }
    2041 2041 vkd3d_free(v->arrays.sizes);
    2042 2042
    2043 if (modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT))
    2044 {
    2045 struct vkd3d_string_buffer *string;
    2046
    2047 if ((string = hlsl_modifiers_to_string(ctx, modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT))))
    2048 hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER,
    2049 "Modifiers '%s' are not allowed on non-parameter variables.", string->buffer);
    2050 hlsl_release_string_buffer(ctx, string);
    2051 }
    2052
  • Elizabeth Figura added 3 commits

    added 3 commits

    • 93dc2501 - vkd3d-shader/hlsl: Check for majority modifiers on non-matrices in apply_type_modifiers().
    • d09ccc73 - vkd3d-shader/hlsl: Remove a redundant warning for mutually exclusive majority modifiers.
    • 7e41e5c9 - vkd3d-shader/hlsl: Avoid warning for each variable when in/out modifiers are...

    Compare with previous version

  • Giovanni Mascellani approved this merge request

    approved this merge request

  • Henri Verbeet approved this merge request

    approved this merge request

  • Alexandre Julliard approved this merge request

    approved this merge request

  • added 8 commits

    • 7e41e5c9...e5b40092 - 3 commits from branch wine:master
    • 1c29b45c - tests: Test macro expansion in pack_matrix pragmas.
    • 1ee7a4e8 - tests: Add more tests for majority modifier syntax.
    • af652874 - vkd3d-shader/hlsl: Check for majority modifiers on non-matrices in apply_type_modifiers().
    • 72ec5563 - vkd3d-shader/hlsl: Remove a redundant warning for mutually exclusive majority modifiers.
    • 6767b7ab - vkd3d-shader/hlsl: Avoid warning for each variable when in/out modifiers are...

    Compare with previous version

  • Please register or sign in to reply
    Loading