Skip to content
Snippets Groups Projects

vkd3d-shader/hlsl: Parse rasteriser-ordered view types.

Merged Henri Verbeet requested to merge hverbeet/vkd3d:for_upstream_0 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
  • Ghost User requested review from @hverbeet

    requested review from @hverbeet

  • Modifiers are otherwise for actual modifier keywords. I can't say this is wrong but it's definitely weird. Less weird would be to use a dedicated HLSL_TYPE_* or a UAV-specific flag.

  • Author Maintainer

    Modifiers are otherwise for actual modifier keywords. I can't say this is wrong but it's definitely weird. Less weird would be to use a dedicated HLSL_TYPE_* or a UAV-specific flag.

    Something like

        if (uav && resource->data_type->e.uav.rasteriser_ordered)
            instr.opcode |= VKD3DSUF_RASTERISER_ORDERED_VIEW << VKD3D_SM5_UAV_FLAGS_SHIFT;

    you mean?

  • Something like

        if (uav && resource->data_type->e.uav.rasteriser_ordered)
            instr.opcode |= VKD3DSUF_RASTERISER_ORDERED_VIEW << VKD3D_SM5_UAV_FLAGS_SHIFT;

    you mean?

    Yes, I think that's what I would do.

  • added 8 commits

    Compare with previous version

  • Alexandre Julliard approved this merge request

    approved this merge request

  • How about the attached series? I turns out that it's a bit awkward to make the "rasteriser_ordered" flag specific to UAVs due to the way "resource_format" is currently used, but making it a resource flag seems close enough to me. The series has a minor conflict with 569. That also looks good to me.

  • Author Maintainer

    I guess hlsl_types_are_equal() should be updated too?

    I added a check for HLSL_TYPE_UAV and "rasteriser_ordered", but I notice we don't compare formats there either for UAVs.

  • I guess hlsl_types_are_equal() should be updated too?

    I added a check for HLSL_TYPE_UAV and "rasteriser_ordered", but I notice we don't compare formats there either for UAVs.

    Yeah, that's not right...

Please register or sign in to reply
Loading