Skip to content
Snippets Groups Projects

hlsl: Avoid HLSL_CLASS_OBJECT, part 1.

Merged Elizabeth Figura requested to merge zfigura/vkd3d:mr0 into master
1 unresolved thread

HLSL_CLASS_OBJECT does not really have much in common, and a lot of code currently uses it assuming that all objects are resources, which is not actually true. Most users of HLSL_CLASS_OBJECT want to check for specific types, and so we can simplify code a fair amount by promoting all object "base types" to top-level classes.

This series is a first step, comprising some cleanup towards that goal.

Merge request reports

Merge request pipeline #24755 skipped

Merge request pipeline skipped for 106cbc02

Merged by Alexandre JulliardAlexandre Julliard 1 year ago (Apr 2, 2024 10:21pm UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
2271 2271 if (!(modifiers & HLSL_STORAGE_STATIC))
2272 2272 var->storage_modifiers |= HLSL_STORAGE_UNIFORM;
2273 2273
2274 if (ctx->profile->major_version < 5 && (var->storage_modifiers & HLSL_STORAGE_UNIFORM) &&
2275 type_has_object_components(var->data_type, true))
2274 if (ctx->profile->major_version < 5 && (var->storage_modifiers & HLSL_STORAGE_UNIFORM)
2275 && var->data_type->class == HLSL_CLASS_STRUCT && type_has_object_components(var->data_type))
  • Elizabeth Figura added 2 commits

    added 2 commits

    • 713455c7 - vkd3d-shader/hlsl: Simplify type_has_object_components().
    • a33ce359 - vkd3d-shader/hlsl: Use hlsl_is_numeric_type() in type_has_object_components().

    Compare with previous version

  • Giovanni Mascellani approved this merge request

    approved this merge request

  • Giovanni Mascellani unapproved this merge request

    unapproved this merge request

  • Giovanni Mascellani approved this merge request

    approved this merge request

  • Henri Verbeet approved this merge request

    approved this merge request

  • added 7 commits

    • a33ce359...d72d5c35 - 3 commits from branch wine:master
    • 675d7b8c - vkd3d-shader/hlsl: Remove a redundant type check.
    • 1e7d8279 - vkd3d-shader/hlsl: Move a hlsl_fixme() to a more relevant place.
    • 54f2dfe4 - vkd3d-shader/hlsl: Simplify type_has_object_components().
    • 106cbc02 - vkd3d-shader/hlsl: Use hlsl_is_numeric_type() in type_has_object_components().

    Compare with previous version

  • Alexandre Julliard approved this merge request

    approved this merge request

  • Please register or sign in to reply
    Loading