Skip to content
Snippets Groups Projects

vkd3d: Fix D3D12_FEATURE_SHADER_MODEL results.

Merged Conor McCarthy requested to merge cmccarthy/vkd3d:shader_model 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
3456 3456 return E_INVALIDARG;
3457 3457 }
3458 3458
3459 if (data->HighestShaderModel > D3D_HIGHEST_SHADER_MODEL)
  • Giovanni Mascellani approved this merge request

    approved this merge request

  • Conor McCarthy added 3 commits

    added 3 commits

    • 7380ead9 - tests: Add tests for D3D12_FEATURE_SHADER_MODEL.
    • 40332dd9 - vkd3d: Return a shader model no higher than the requested one for D3D12_FEATURE_SHADER_MODEL.
    • f3708c59 - vkd3d: Return E_INVALIDARG if the requested shader model is unknown.

    Compare with previous version

  • Conor McCarthy added 3 commits

    added 3 commits

    • 4dd797c5 - tests: Add tests for D3D12_FEATURE_SHADER_MODEL.
    • 7a48d0bf - vkd3d: Return a shader model no higher than the requested one for D3D12_FEATURE_SHADER_MODEL.
    • 4d77b17d - vkd3d: Return E_INVALIDARG if the requested shader model is unknown.

    Compare with previous version

  • Henri Verbeet approved this merge request

    approved this merge request

  • added 30 commits

    • 4d77b17d...77259da1 - 27 commits from branch wine:master
    • 677c23f1 - tests: Add tests for D3D12_FEATURE_SHADER_MODEL.
    • d17956ce - vkd3d: Return a shader model no higher than the requested one for D3D12_FEATURE_SHADER_MODEL.
    • fb20639e - vkd3d: Return E_INVALIDARG if the requested shader model is unknown.

    Compare with previous version

  • Alexandre Julliard approved this merge request

    approved this merge request

  • Please register or sign in to reply
    Loading