Skip to content
Snippets Groups Projects

tests: Do not crash on llvmpipe.

Merged Giovanni Mascellani requested to merge giomasce/vkd3d:vulcano 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
  • Giovanni Mascellani approved this merge request

    approved this merge request

  • added 2 commits

    • bb7db2b0 - tests: Skip tests that crash on llvmpipe.
    • c8d0b8dd - tests: Pop the test context when leaving its scope.

    Compare with previous version

  • added 5 commits

    • de7af6d6 - tests: Do not crash on some test failures.
    • 2f3f08b5 - tests: Skip tests that crash on llvmpipe.
    • d04614fc - tests: Add llvmpipe among the Mesa drivers.
    • 3a1a8160 - tests: Pop the test context when leaving its scope.
    • c1405948 - ci: Build Mesa for release.

    Compare with previous version

  • +    /* llvmpipe has maxBoundDescriptorSet == 8, which is smaller than we currently need. */

    "... which is less than ...", probably. Might not hurt to include version information here as well.

    +        /* llvmpipe crashes with mutable descriptors are used. I don't
    +         * know yet whether this is a bug in vkd3d or Mesa. */

    "crashes when"

    +static void get_physical_device_properties(
    +        ID3D12Device *device, VkPhysicalDeviceProperties *device_properties)
    +{
    +    PFN_vkGetPhysicalDeviceProperties pfn_vkGetPhysicalDeviceProperties;
    +    VkPhysicalDevice vk_physical_device;
    +    VkInstance vk_instance;
    +
    +    vk_instance = vkd3d_instance_get_vk_instance(vkd3d_instance_from_device(device));
    +    pfn_vkGetPhysicalDeviceProperties = (void *)vkGetInstanceProcAddr(vk_instance,
    +            "vkGetPhysicalDeviceProperties");
    +    vk_physical_device = vkd3d_get_vk_physical_device(device);
    +    pfn_vkGetPhysicalDeviceProperties(vk_physical_device, device_properties);
    +}

    I think the main point of this function is retrieving "device_properties.driverVersion" in is_llvmpipe_device_gte(), right? Should we just return "device_properties2.properties.driverVersion" from get_driver_properties() instead?

  • added 6 commits

    • 052164be - tests: Mark some test failures as todo on llvmpipe.
    • 71f5f080 - tests: Skip some tests that crash on llvmpipe.
    • 4f9ccf39 - tests: Print the device name.
    • 7890dc21 - tests: Add llvmpipe among the Mesa drivers.
    • 33002f35 - tests: Pop the test context when leaving its scope.
    • 9bae867a - ci: Build Mesa for release.

    Compare with previous version

  • Henri Verbeet approved this merge request

    approved this merge request

  • Alexandre Julliard added 47 commits

    added 47 commits

    • 9bae867a...a2bb4ef3 - 41 commits from branch wine:master
    • 0b2ce5c1 - tests: Mark some test failures as todo on llvmpipe.
    • 7cfb02cf - tests: Skip some tests that crash on llvmpipe.
    • ecd38f3d - tests: Print the device name.
    • 59a5d8f8 - tests: Add llvmpipe among the Mesa drivers.
    • 0be29f78 - tests: Pop the test context when leaving its scope.
    • 42f07352 - ci: Build Mesa for release.

    Compare with previous version

  • Alexandre Julliard approved this merge request

    approved this merge request

Please register or sign in to reply
Loading