Skip to content
Snippets Groups Projects

hlsl: Recursive function calls.

Merged Elizabeth Figura requested to merge zfigura/vkd3d:pr1 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
2609 2651 {
2610 2652 const struct hlsl_profile_info *profile = ctx->profile;
2611 2653 struct hlsl_block *const body = &entry_func->body;
2654 struct recursive_call_ctx recursive_call_ctx;
2612 2655 struct hlsl_ir_var *var;
2613 2656 unsigned int i;
2614 2657 bool progress;
2615 2658
2616 2659 list_move_head(&body->instrs, &ctx->static_initializers);
2617 2660
2661 memset(&recursive_call_ctx, 0, sizeof(recursive_call_ctx));
2662 transform_ir(ctx, find_recursive_calls, body, &recursive_call_ctx);
  • Same comment as Francisco. Other than that, it looks fine.

  • added 1 commit

    • 3f180e9c - vkd3d-shader/hlsl: Forbid recursive calls.

    Compare with previous version

  • Annoyingly I missed Francisco's comment due to the bridge malfunctioning. Pushed a v2 now with that fixed, thanks.

  • Francisco Casas approved this merge request

    approved this merge request

  • Giovanni Mascellani approved this merge request

    approved this merge request

  • Henri Verbeet approved this merge request

    approved this merge request

  • added 23 commits

    • 3f180e9c...13c8e8b8 - 18 commits from branch wine:master
    • 6c2472ce - vkd3d-shader/hlsl: Remove some unnecessary YYABORTs from the func_prototype_no_attrs rule.
    • 447463e5 - vkd3d-shader/hlsl: Remove the unused "intrinsic" argument from hlsl_add_function().
    • 521f22e5 - vkd3d-shader/hlsl: Store a non-constant hlsl_ir_function_decl pointer in struct hlsl_ir_call.
    • 503be424 - tests/shader_runner: Explicitly track the expected shader compilation HRESULT...
    • 9c817e5e - vkd3d-shader/hlsl: Forbid recursive calls.

    Compare with previous version

  • Alexandre Julliard approved this merge request

    approved this merge request

  • Please register or sign in to reply
    Loading