diff options
| author | Sebastian Neubauer <Sebastian.Neubauer@amd.com> | 2023-11-29 17:37:04 +0100 |
|---|---|---|
| committer | Sebastian Neubauer <Sebastian.Neubauer@amd.com> | 2023-11-29 17:37:04 +0100 |
| commit | 778c8225bafe78e83a942132ee5c21a056679216 (patch) | |
| tree | 5f85d1e88168aac8081cb4854b821f247d2dc837 /pkgs/tools/graphics/vulkan-cts | |
| parent | 8cfef6986adfb599ba379ae53c9f5631ecd2fd9c (diff) | |
vulkan-cts: 1.3.7.0 -> 1.3.7.2
Changelog: https://github.com/KhronosGroup/VK-GL-CTS/releases/tag/vulkan-cts-1.3.7.1 Changelog: https://github.com/KhronosGroup/VK-GL-CTS/releases/tag/vulkan-cts-1.3.7.2 Also add an test that runs a simple cts test with lavapipe.
Diffstat (limited to 'pkgs/tools/graphics/vulkan-cts')
| -rw-r--r-- | pkgs/tools/graphics/vulkan-cts/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/tools/graphics/vulkan-cts/sources.nix | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix index aba088a1128f2..983d96f8d1f36 100644 --- a/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchFromGitHub , fetchurl +, runCommand , cmake , ffmpeg_4 , libdrm @@ -12,6 +13,7 @@ , libXdmcp , libxcb , makeWrapper +, mesa , ninja , pkg-config , python3 @@ -37,13 +39,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-cts"; - version = "1.3.7.0"; + version = "1.3.7.2"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "VK-GL-CTS"; rev = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-f7i7gytk3cKeFQD0FR+nrUR2o0FWaJWKG7OpDz9u42E="; + hash = "sha256-TnHFCEGKgn1U00aUDMX7UEWSeTjzysmX7rOQCZTL8FU="; }; prePatch = '' @@ -104,6 +106,12 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru.updateScript = ./update.sh; + passthru.tests.lavapipe = runCommand "vulkan-cts-tests-lavapipe" { nativeBuildInputs = [ finalAttrs.finalPackage ]; } '' + # Expand the wildcard to pick the existing architecture + export VK_ICD_FILENAMES=$(echo ${mesa.drivers}/share/vulkan/icd.d/lvp_icd.*.json) + deqp-vk -n dEQP-VK.api.smoke.triangle + touch $out + ''; meta = with lib; { description = "Khronos Vulkan Conformance Tests"; diff --git a/pkgs/tools/graphics/vulkan-cts/sources.nix b/pkgs/tools/graphics/vulkan-cts/sources.nix index 59480657da068..647b5e12c2d91 100644 --- a/pkgs/tools/graphics/vulkan-cts/sources.nix +++ b/pkgs/tools/graphics/vulkan-cts/sources.nix @@ -32,8 +32,8 @@ rec { nvidia-video-samples = fetchFromGitHub { owner = "Igalia"; repo = "vk_video_samples"; - rev = "cts-integration-0.9.9-1"; - hash = "sha256-vHUyGAx/n8yTnrFjeefbb8LsHxONxsjH3BG2D/RO99E="; + rev = "cts-integration-0.9.9-2"; + hash = "sha256-ftHhb5u3l7WbgEu6hHynBnvNbVOn5TFne915M17jiAQ="; }; spirv-headers = fetchFromGitHub { |