Skip to content
Snippets Groups Projects

hlsl: Fix some type handling for ternaries.

Merged Elizabeth Figura requested to merge zfigura/vkd3d:mr0 into master

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
  • Elizabeth Figura added 3 commits

    added 3 commits

    • ef013712 - tests: Add many more tests for ternary expressions.
    • 20137ad0 - vkd3d-shader/hlsl: Separate an add_ternary() helper.
    • 0fc728f0 - vkd3d-shader/hlsl: Allow non-numeric types in the ternary operator.

    Compare with previous version

  • Elizabeth Figura added 3 commits

    added 3 commits

    • a00da94c - tests: Add many more tests for ternary expressions.
    • fc5b4397 - vkd3d-shader/hlsl: Separate an add_ternary() helper.
    • 3cd76cde - vkd3d-shader/hlsl: Allow non-numeric types in the ternary operator.

    Compare with previous version

  • Author Developer

    Sorry for the double push, I went and added [test] blocks anyway, then realized I had forgotten to address the other comment.

  • Giovanni Mascellani resolved all threads

    resolved all threads

  • The failure persisted after retrying the pipeline, and it also happens on my computer, so it doesn't look like an occasional hiccup. Can you reproduce it too?

  • Elizabeth Figura added 3 commits

    added 3 commits

    • 342ebed4 - tests: Add many more tests for ternary expressions.
    • 922b3cc7 - vkd3d-shader/hlsl: Separate an add_ternary() helper.
    • ea32e381 - vkd3d-shader/hlsl: Allow non-numeric types in the ternary operator.

    Compare with previous version

  • Author Developer

    The failure that looked like a CI problem was one of the machines not detecting a working compiler.

    But the failure in ternary.shader_test was me somehow forgetting to add todo annotations. Sorry about that. Fixed now.

  • The failure that looked like a CI problem was one of the machines not detecting a working compiler.

    It's still failing, most likely because this MR is based on a very old source branch. It's missing commit f087aa75 in particular.

  • Elizabeth Figura added 173 commits

    added 173 commits

    • ea32e381...bb64bfff - 168 commits from branch wine:master
    • 400cb650 - vkd3d-shader/hlsl: Remove a redundant definition of the "float" type.
    • 7fe039b1 - vkd3d-shader/hlsl: Do not try to lower ternaries of types other than scalar or vector.
    • fa9d5800 - tests: Add many more tests for ternary expressions.
    • e9d9fb8f - vkd3d-shader/hlsl: Separate an add_ternary() helper.
    • f020603d - vkd3d-shader/hlsl: Allow non-numeric types in the ternary operator.

    Compare with previous version

  • Author Developer

    Rebased.

  • Elizabeth Figura added 3 commits

    added 3 commits

    • 56d429ba - tests: Add many more tests for ternary expressions.
    • 457864d2 - vkd3d-shader/hlsl: Separate an add_ternary() helper.
    • 2119ab84 - vkd3d-shader/hlsl: Allow non-numeric types in the ternary operator.

    Compare with previous version

  • Giovanni Mascellani approved this merge request

    approved this merge request

  • This fails to apply; effect_types[] in patch 1/3 was modified by commit e527d7c1 since this MR was last rebased.

  • Elizabeth Figura added 48 commits

    added 48 commits

    • 2119ab84...68b898fc - 43 commits from branch wine:master
    • 26a7a596 - vkd3d-shader/hlsl: Remove a redundant definition of the "float" type.
    • c53e5861 - vkd3d-shader/hlsl: Do not try to lower ternaries of types other than scalar or vector.
    • c3470eba - tests: Add many more tests for ternary expressions.
    • 8a7a4bd2 - vkd3d-shader/hlsl: Separate an add_ternary() helper.
    • 4a4dba80 - vkd3d-shader/hlsl: Allow non-numeric types in the ternary operator.

    Compare with previous version

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