Skip to content
Snippets Groups Projects

vkd3d-shader/hlsl: Parse state block entries function call syntax.

Merged Francisco Casas requested to merge fcasas/vkd3d:stateblock_part into master
2 unresolved threads

Allows the parsing of state block entries using the function syntax (in contrast to the assignment syntax which is already upstream).

The next step is parsing the compile and CompileShader() syntaxes to allow parsing expressions such as these:

technique10 T0
{
    pass P0
    {
        SetPixelShader(CompileShader(ps_4_0, function(arg)));
    }
}

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
5545 const char *name;
5546 unsigned int min_args, max_args;
5547 }
5548 valid_functions[] =
5549 {
5550 {"SetBlendState", 3, 3},
5551 {"SetDepthStencilState", 2, 2},
5552 {"SetRasterizerState", 1, 1},
5553 {"SetVertexShader", 1, 1},
5554 {"SetDomainShader", 1, 1},
5555 {"SetHullShader", 1, 1},
5556 {"SetGeometryShader", 1, 1},
5557 {"SetPixelShader", 1, 1},
5558 {"SetComputeShader", 1, 1},
5559 {"OMSetRenderTargets", 2, 9},
5560 };
  • added 1 commit

    • a10baed8 - vkd3d-shader/hlsl: Validate state block function calls.

    Compare with previous version

  • Henri Verbeet requested review from @zfigura

    requested review from @zfigura

  • Elizabeth Figura approved this merge request

    approved this merge request

  • added 1 commit

    • 4b0fecb3 - vkd3d-shader/hlsl: Validate state block function calls.

    Compare with previous version

  • Francisco Casas added 20 commits

    added 20 commits

    • 4b0fecb3...ccb6150a - 16 commits from branch wine:master
    • ae21e9e3 - tests: Separate valid stateblock function names test from string arg test.
    • ec39cef1 - vkd3d-shader/hlsl: Parse function call syntax on state blocks.
    • 06b871d5 - tests: Test if valid state block function names are case-sensitive.
    • 99fe54ff - vkd3d-shader/hlsl: Validate state block function calls.

    Compare with previous version

  • Author Developer

    Rebased on top of current master so that the mac CI job is allowed to fail.

  • Henri Verbeet approved this merge request

    approved this merge request

  • Henri Verbeet added 48 commits

    added 48 commits

    • 99fe54ff...7bd53cf6 - 44 commits from branch wine:master
    • f15d8dc9 - tests: Separate the valid stateblock function names test from the string arg test.
    • b5f2e7da - vkd3d-shader/hlsl: Parse function call syntax on state blocks.
    • af7c4010 - tests: Test whether valid state block function names are case-sensitive.
    • 60c8a813 - vkd3d-shader/hlsl: Validate state block function calls.

    Compare with previous version

  • Please register or sign in to reply
    Loading