Skip to content
Snippets Groups Projects

vkd3d-shader/hlsl: A couple of type refactors.

Merged Elizabeth Figura requested to merge zfigura/vkd3d:mr3 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
  • Francisco Casas
    Francisco Casas @fcasas started a thread on commit 0637d901
  • 483 490 }
    484 491 type->class = type_class;
    485 492 type->e.numeric.type = base_type;
    486 type->dimx = dimx;
    487 type->dimy = dimy;
    493 type->e.numeric.dimx = dimx;
    494 type->e.numeric.dimy = dimy;
    • Comment on lines 492 to +494

      Oh, it is a preexisting issue but I think we should not be initializing these fields if the type class is not numeric. Albeit the only instance of this happening is the

          ctx->builtin_types.null = hlsl_new_type(ctx, "NULL", HLSL_CLASS_NULL, HLSL_TYPE_UINT, 1, 1);

      we do in declare_predefined_types().

    • Yeah, the purpose of this commit was partially to remove that. I think it predates the NULL type; it's gone through a lot of rebasing :P

    • I wouldn't mind if these assignments are wrapped in a if (base_type <= HLSL_CLASS_LAST_NUMERIC) though. But it is not blocking.

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

    • 688b3e1e - vkd3d-shader/d3dbc: Do not access the type dimensions for non-numeric types.
    • 5085232b - vkd3d-shader/hlsl: Move the "dimx" and "dimy" fields to the type-specific union.

    Compare with previous version

  • Elizabeth Figura added 16 commits

    added 16 commits

    • 5085232b...b60995b1 - 13 commits from branch wine:master
    • a8f2ba88 - vkd3d-shader/hlsl: Avoid some uses of the default case when switching over hlsl_base_type.
    • f3983366 - vkd3d-shader/d3dbc: Do not access the type dimensions for non-numeric types.
    • daad2959 - vkd3d-shader/hlsl: Move the "dimx" and "dimy" fields to the type-specific union.

    Compare with previous version

  • added 2 commits

    • 64014f56 - vkd3d-shader/d3dbc: Do not access the type dimensions for non-numeric types.
    • 312b8d72 - vkd3d-shader/hlsl: Move the "dimx" and "dimy" fields to the type-specific union.

    Compare with previous version

  • added 1 commit

    • 8c8202af - vkd3d-shader/hlsl: Move the "dimx" and "dimy" fields to the type-specific union.

    Compare with previous version

  • Francisco Casas approved this merge request

    approved this merge request

  • Henri Verbeet approved this merge request

    approved this merge request

  • Henri Verbeet added 4 commits

    added 4 commits

    • 646087d5 - 1 commit from branch wine:master
    • 1ff1a51e - vkd3d-shader/hlsl: Avoid some uses of the default case when switching over hlsl_base_type.
    • 39239879 - vkd3d-shader/d3dbc: Do not access the type dimensions for non-numeric types.
    • 29bac62b - vkd3d-shader/hlsl: Move the "dimx" and "dimy" fields to the type-specific union.

    Compare with previous version

  • Please register or sign in to reply
    Loading