Skip to content
Snippets Groups Projects

tests/shader-runner: Make geometry shaders optional.

Merged Giovanni Mascellani requested to merge giomasce/vkd3d:vesuvio into master
1 unresolved thread

This allows the Vulkan runner to execute in environments which do not support geometry shaders, most notably MoltenVK. In particular, that enables SM<4 shaders to run in such environments

Merge request reports

Merge request pipeline #33295 skipped

Merge request pipeline skipped for bc351f4b

Merged by Henri VerbeetHenri Verbeet 5 months ago (Oct 15, 2024 3:05pm 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
  • Giovanni Mascellani approved this merge request

    approved this merge request

    • In principle I don't have an issue with this MR, but note that 4553b2a0 added the geometry shader capability for the SV_PrimitiveID usage in rasteriser-ordered-views.shader_test, while geometry.shader_test doesn't end up actually executing on the Vulkan runner because the vkd3d-shader HLSL support isn't there.

    • Right, I completely overlooked that comment. I pushed something that should fix this problem. It is probably not an ideal solution, since from the point of view of the shader runner ROV.shader_test is not really using geometry shaders. Needing that capability is rather a quirk of how Vulkan works. The correct solution would probably be adding yet another shader runner capability, called e.g. primitiveid-in-pixel-shader, which is satisfied with geometryShader on the Vulkan runner. I can do that if you want, but it looks a bit excessive.

      Yes, I know that the Vulkan runner is not going to execute geometry shaders, but I hope this will eventually be solved. Also, the point of this MR is not to run geometry shaders tests, but rather to run all the other tests which are currently excluded because of an irrelevant feature (on MoltenVK, at least).

    • Please register or sign in to reply
  • added 1 commit

    • 53c5b6e8 - tests/shader-runner: Make geometry shaders optional.

    Compare with previous version

  • Henri Verbeet approved this merge request

    approved this merge request

  • Henri Verbeet added 15 commits

    added 15 commits

    Compare with previous version

Please register or sign in to reply
Loading