Skip to content
Snippets Groups Projects

vkd3d-shader/hlsl: Parse strings.

Merged Francisco Casas requested to merge fcasas/vkd3d:parse_strings into master

The patches from !943 (merged) that take care of parsing strings. To unload that MR a bit.

Merge request reports

Merge request pipeline #29885 skipped

Merge request pipeline skipped for e8354ac4

Merged by Henri VerbeetHenri Verbeet 8 months ago (Aug 7, 2024 2:01pm 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
  • Giovanni Mascellani
  • A couple of comments, but I haven't reviewed in depth yet.

    • I wanted to add a fx.c changes draft based on this, but noticed that in this MR string values are not actually retained for variables? Is that an intentional omission?

    • Author Developer

      Yep, I didn't include storing strings in hlsl_ir_var->default_values in this MR. I will work on a patch on top of this for a later MR.

    • Please register or sign in to reply
  • Francisco Casas added 2 commits

    added 2 commits

    • f1e79260 - vkd3d-shader/hlsl: Parse string escape sequences.
    • 21588edf - vkd3d-shader/hlsl: Parse string type.

    Compare with previous version

  • Giovanni Mascellani
  • Giovanni Mascellani
  • Giovanni Mascellani
  • 49 49 {
    50 50 return 0;
    51 51 }
    52
    53
    54 % Escape sequences are hanlded differently in DXC.
    55 % Octal, hexadecimal, and unicode escape sequences that are out of range are considered errors.
    56 [pixel shader todo fail(sm>=6)]
    57 string a = "\nAAA\tBBB\rCCC\fDDD\vEEE\sFFF";
  • Giovanni Mascellani
  • Giovanni Mascellani
  • Giovanni Mascellani
  • added 1 commit

    • e897fa05 - vkd3d-shader/hlsl: Parse string type.

    Compare with previous version

  • Giovanni Mascellani approved this merge request

    approved this merge request

  • Henri Verbeet approved this merge request

    approved this merge request

  • Henri Verbeet added 53 commits

    added 53 commits

    • e897fa05...c44a18b3 - 49 commits from branch wine:master
    • 4b2e847d - tests: Test string escape sequences.
    • 090df488 - vkd3d-shader/hlsl: Parse string constants.
    • 652db433 - vkd3d-shader/hlsl: Parse string escape sequences.
    • e8354ac4 - vkd3d-shader/hlsl: Parse string type.

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading