Skip to content
Snippets Groups Projects

hlsl: Return hlsl_ir_node pointers from instruction constructors, part 7.

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

BORING

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
  • BORING

    He, not enough! :-P

    Starting with vkd3d-shader/hlsl: Pass a hlsl_constant_value pointer to hlsl_new_constant(). I get this error on object-references.shader_test:

    shader_runner:625: Section [test], line 113: Test failed: Got {3.00000000e+02, 3.00000000e+02, 3.00000000e+02, 1.00000000e+02}, expected {3.12000000e+02, 3.12000000e+02, 3.12000000e+02, 1.11000000e+02} at (0, 0).
    shader_runner:625: Section [test], line 136: Test failed: Got {2.00000000e+03, 2.00000000e+03, 2.00000000e+03, 1.00000000e+03}, expected {2.13200000e+03, 2.13200000e+03, 2.13200000e+03, 1.11100000e+03} at (0, 0).
  • Elizabeth Figura added 7 commits

    added 7 commits

    • 8d5e2e7d - vkd3d-shader/hlsl: Use the writemask to map the coords swizzle for load instructions.
    • 623eb246 - vkd3d-shader/hlsl: Only read used coordinates in encode_texel_offset_as_aoffimmi().
    • 5456e30e - vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_bit_xor().
    • 8e531b31 - vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_bit_and().
    • 46ab53e6 - vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_bit_or().
    • ca620ceb - vkd3d-shader/hlsl: Pass a hlsl_constant_value pointer to hlsl_new_constant().
    • a0fe1265 - vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_constant().

    Compare with previous version

  • Author Developer

    Looks like uninitialized memory, I added two commits to the beginning to fix it.

  • Giovanni Mascellani approved this merge request

    approved this merge request

  • Thanks for fixing my bug! :-)

    BTW, I think it would eventually make sense to have some hlsl_new_zero_constant(hlsl_ir_type*) helper. We do that quite often.

  • Author Developer

    Yeah, after rebasing this for a severalth time I'm also thinking we need hlsl_new_float4_constant() et al. I'll write some patches after this one.

  • This will need an update after !207 (merged).

  • Elizabeth Figura added 14 commits

    added 14 commits

    • a0fe1265...ebf75735 - 7 commits from branch wine:master
    • c6399cc5 - vkd3d-shader/hlsl: Use the writemask to map the coords swizzle for load instructions.
    • 4b520a85 - vkd3d-shader/hlsl: Only read used coordinates in encode_texel_offset_as_aoffimmi().
    • d31f119c - vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_bit_xor().
    • 387860c9 - vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_bit_and().
    • 0b6cb602 - vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_bit_or().
    • f8f6f758 - vkd3d-shader/hlsl: Pass a hlsl_constant_value pointer to hlsl_new_constant().
    • 47cf7cc5 - vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_constant().

    Compare with previous version

  • Henri Verbeet approved this merge request

    approved this merge request

  • added 7 commits

    • 7b476573 - vkd3d-shader/hlsl: Use the writemask to map the coords swizzle for load instructions.
    • 974528cb - vkd3d-shader/hlsl: Only read used coordinates in encode_texel_offset_as_aoffimmi().
    • a7a09ac5 - vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_bit_xor().
    • 1049f489 - vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_bit_and().
    • 79f443d1 - vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_bit_or().
    • 740b0ad8 - vkd3d-shader/hlsl: Pass a hlsl_constant_value pointer to hlsl_new_constant().
    • f34b107f - vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_constant().

    Compare with previous version

  • Alexandre Julliard approved this merge request

    approved this merge request

Please register or sign in to reply
Loading