Skip to content
Snippets Groups Projects

vkd3d-shader/hlsl: More miscelaneous fixes.

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

Just a few miscellaneous fixes I think are simple enough to make it into the next version.

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
122 122 tests/math.shader_test \
123 123 tests/matrix-semantics.shader_test \
124 124 tests/multiple-rt.shader_test \
125 tests/max.shader_test \
  • Elizabeth Figura
    Elizabeth Figura @zfigura started a thread on an outdated change in commit c13ca987
  • 3345 3345 }
    3346 3346
    3347 3347 buffer_body:
    3348 '{' declaration_statement_list '}'
    3348 '{' '}'
    3349 {
    3350 ctx->cur_buffer = ctx->globals_buffer;
    3351 }
    3352 | '{' declaration_statement_list '}'
    • Comment on lines +3348 to +3352

      Probably simpler just to use %empty in declaration_statement_list?

    • Author Developer

      That produces shift/reduce and reduce/reduce conflicts. I can't say that I understand why; I am spending some time reading about the Bison algorithm.

    • Author Developer

      Ah, I attempted to do:

      declaration_statement_list:
            %empty
          | declaration_statement
          | declaration_statement_list declaration_statement

      so there where two possible reductions for the first declaration statement.

      Removing the | declaration_statement rule works:

      declaration_statement_list:
            %empty
          | declaration_statement_list declaration_statement

      So I am going for that.

    • Francisco Casas changed this line in version 3 of the diff

      changed this line in version 3 of the diff

    • Yeah, I meant that latter one. Sorry, I should have been clearer.

    • Ugh, and now that I notice it we're also leaking / failing to handle declaration_statement here. Annoying that bison doesn't warn here when declaration_statement_list has no type but declaration_statement does.

    • Ugh, and now that I notice it we're also leaking / failing to handle declaration_statement here. Annoying that bison doesn't warn here when declaration_statement_list has no type but declaration_statement does.

      To be clear that's a preëxisting problem, doesn't need a fix in this patch set.

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

    added 4 commits

    • f1e175cf - tests: Add missing entry for max.shader_test in Makefile.am
    • 7349f2cf - vkd3d-shader/hlsl: Check for non-static object references on resource stores.
    • e58ddccb - vkd3d-shader/hlsl: Don't produce a parse error on empty buffer_body.
    • 3372940f - vkd3d-shader/hlsl: Revert expr_compatible_data_types() args names to "t1" and "t2".

    Compare with previous version

  • Giovanni Mascellani approved this merge request

    approved this merge request

  • I agree it makes sense to make a freeze exception for this MR.

  • Henri Verbeet approved this merge request

    approved this merge request

  • Alexandre Julliard approved this merge request

    approved this merge request

  • added 4 commits

    • dd100886 - tests: Add missing entry for max.shader_test in Makefile.am.
    • f100f5b7 - vkd3d-shader/hlsl: Check for non-static object references on resource stores.
    • bd501ce3 - vkd3d-shader/hlsl: Don't produce a parse error on empty buffer_body.
    • 43631bde - vkd3d-shader/hlsl: Revert expr_compatible_data_types() args names to "t1" and "t2".

    Compare with previous version

  • Please register or sign in to reply
    Loading