gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vulkan-cts: 1.3.10.0 -> 1.4.1.3 (#391105)

Browse Source
This commit is contained in:
Wolfgang Walther
2025-04-21 15:14:40 +00:00
committed by GitHub
parent 78d4d5e160 0b9ab0f710
commit 687301e668
3 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/by-name/vu/vulkan-cts/package.nix
View File

@@ -45,13 +45,13 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "vulkan-cts"; pname = "vulkan-cts";
version = "1.3.10.0"; version = "1.4.1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "VK-GL-CTS"; repo = "VK-GL-CTS";
rev = "vulkan-cts-${finalAttrs.version}"; rev = "vulkan-cts-${finalAttrs.version}";
hash = "sha256-owa4Z/gu9+plPxeSfduS3gUk9WTOHSDoXLTBju6tTGc="; hash = "sha256-44UGGeuKMCP4fLsZnIPdWDjozd87su9TUbFBnftVrNY=";
}; };
prePatch = '' prePatch = ''
@@ -107,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
# For vulkan-validation-layers # For vulkan-validation-layers
"-DGLSLANG_INSTALL_DIR=${glslang}" "-DGLSLANG_INSTALL_DIR=${glslang}"
"-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}" "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}"
"-DSELECTED_BUILD_TARGETS=deqp-vk"
]; ];
postInstall = '' postInstall = ''
@@ -114,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
! test -e $out ! test -e $out
mkdir -p $out/bin $out/archive-dir mkdir -p $out/bin $out/archive-dir
cp -a external/vulkancts/modules/vulkan/deqp-vk external/vulkancts/modules/vulkan/deqp-vksc $out/bin/ cp -a external/vulkancts/modules/vulkan/deqp-vk $out/bin/
cp -a external/vulkancts/modules/vulkan/vulkan $out/archive-dir/ cp -a external/vulkancts/modules/vulkan/vulkan $out/archive-dir/
cp -a external/vulkancts/modules/vulkan/vk-default $out/ cp -a external/vulkancts/modules/vulkan/vk-default $out/

46
pkgs/by-name/vu/vulkan-cts/sources.nix
View File

@@ -4,15 +4,15 @@ rec {
amber = fetchFromGitHub { amber = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "amber"; repo = "amber";
rev = "67fea651b886460d7b72295e680528c059bbbe40"; rev = "1ec5e96db7e0343d045a52c590e30eba154f74a8";
hash = "sha256-oDN7UdyfNMG4r36nnRJmYdbd0wyd1titGQQNa9e/3tU="; hash = "sha256-4LoV7PfkwLrg+7GyuB1poC/9zE/3jy8nhs+uPe2U3lA=";
}; };
glslang = fetchFromGitHub { glslang = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "glslang"; repo = "glslang";
rev = "c5b76b78c9dec95251e9c1840a671e19bf61abe3"; rev = "3a2834e7702651043ca9f35d022739e740563516";
hash = "sha256-N7vGPqQieWnr+mbrmdbvzz7n9q3bbRKLxkYt6OiaJvU="; hash = "sha256-hHmqvdgBS23bLGCzlKJtlElw79/WvxEbPSwpbQFHQYY=";
}; };
jsoncpp = fetchFromGitHub { jsoncpp = fetchFromGitHub {
@@ -25,40 +25,54 @@ rec {
nvidia-video-samples = fetchFromGitHub { nvidia-video-samples = fetchFromGitHub {
owner = "Igalia"; owner = "Igalia";
repo = "vk_video_samples"; repo = "vk_video_samples";
rev = "6821adf11eb4f84a2168264b954c170d03237699"; rev = "45fe88b456c683120138f052ea81f0a958ff3ec4";
hash = "sha256-prshOzxUHLYi64Pbyytsp+XvmtIIyhx/3n5IVimYH64="; hash = "sha256-U5IoiRKXsdletVlnHVz8rgMEwDOZFAuld5Bzs0rvcR4=";
}; };
spirv-headers = fetchFromGitHub { spirv-headers = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "SPIRV-Headers"; repo = "SPIRV-Headers";
rev = "2a9b6f951c7d6b04b6c21fe1bf3f475b68b84801"; rev = "36d5e2ddaa54c70d2f29081510c66f4fc98e5e53";
hash = "sha256-o1yRTvP7a+XVwendTKBJKNnelVGWLD0gH258GGeUDhQ="; hash = "sha256-8hx8/1vaY4mRnfNaBsghWqpzyzY4hkVkNFbQEFZif9g=";
}; };
spirv-tools = fetchFromGitHub { spirv-tools = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "SPIRV-Tools"; repo = "SPIRV-Tools";
rev = "44936c4a9d42f1c67e34babb5792adf5bce7f76b"; rev = "3fb52548bc8a68d349d31e21bd4e80e3d953e87c";
hash = "sha256-kSiP94hMlblFod2mQhlAQDAENGOvBh7v8bCxxaiYWq4="; hash = "sha256-RJ3Q3U4GjqvUXDy8Jd4NWgjhKOxYMMK1Jerj19dAqno=";
};
video_generator = fetchFromGitHub {
owner = "Igalia";
repo = "video_generator";
rev = "426300e12a5cc5d4676807039a1be237a2b68187";
hash = "sha256-zdYYpX3hed7i5onY7c60LnM/e6PLa3VdrhXTV9oSlvg=";
}; };
vulkan-docs = fetchFromGitHub { vulkan-docs = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "Vulkan-Docs"; repo = "Vulkan-Docs";
rev = "486e4b289053a7d64784e7ce791711843c60c235"; rev = "c7a3955e47d223c6a37fb29e2061c973eec98d0a";
hash = "sha256-LGAHUeWF9X6Li1HcdD14pgnBUquWxA+bQpAL09JmwLQ="; hash = "sha256-dTkLzENuEfe0TVvJAgYevJNPyI/lWbjx8Pzz3Lj76PY=";
}; };
vulkan-validationlayers = fetchFromGitHub { vulkan-validationlayers = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "Vulkan-ValidationLayers"; repo = "Vulkan-ValidationLayers";
rev = "9a46ae006fa5c92e2d2af7944187f7794210844b"; rev = "902f3cf8d51e76be0c0deb4be39c6223abebbae2";
hash = "sha256-qVQy3kKkZRWHjtj2YxJTZqKg1kwnmLa3bgVathisfOc="; hash = "sha256-p4DFlyU1jjfVFlEOE21aNHfqaTZ8QbSCFQfpsYS0KR0=";
};
vulkan-video-samples = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Video-Samples";
rev = "0e87744edbb84c9c56c3fc8de9ea5150af5ee4ea";
hash = "sha256-CZ1zoX9gI+Ac/jf2IxWk59NXPiW6qcMhj9laoZnQfd8=";
}; };
prePatch = '' prePatch = ''
mkdir -p external/amber external/glslang external/jsoncpp external/nvidia-video-samples external/spirv-headers external/spirv-tools external/vulkan-docs external/vulkan-validationlayers mkdir -p external/amber external/glslang external/jsoncpp external/nvidia-video-samples external/spirv-headers external/spirv-tools external/video_generator external/vulkan-docs external/vulkan-validationlayers external/vulkan-video-samples
cp -r ${amber} external/amber/src cp -r ${amber} external/amber/src
cp -r ${glslang} external/glslang/src cp -r ${glslang} external/glslang/src
@@ -66,7 +80,9 @@ rec {
cp -r ${nvidia-video-samples} external/nvidia-video-samples/src cp -r ${nvidia-video-samples} external/nvidia-video-samples/src
cp -r ${spirv-headers} external/spirv-headers/src cp -r ${spirv-headers} external/spirv-headers/src
cp -r ${spirv-tools} external/spirv-tools/src cp -r ${spirv-tools} external/spirv-tools/src
cp -r ${video_generator} external/video_generator/src
cp -r ${vulkan-docs} external/vulkan-docs/src cp -r ${vulkan-docs} external/vulkan-docs/src
cp -r ${vulkan-validationlayers} external/vulkan-validationlayers/src cp -r ${vulkan-validationlayers} external/vulkan-validationlayers/src
cp -r ${vulkan-video-samples} external/vulkan-video-samples/src
''; '';
} }

2
pkgs/by-name/vu/vulkan-cts/vk-cts-sources.py
View File

@@ -74,7 +74,7 @@ def main():
f.write(f" hash = \"{hash}\";\n"); f.write(f" hash = \"{hash}\";\n");
f.write(f" }};\n"); f.write(f" }};\n");
f.write("\n\n prePatch = ''\n"); f.write("\n prePatch = ''\n");
f.write(" mkdir -p"); f.write(" mkdir -p");
for pkg in pkgs: for pkg in pkgs:
if isinstance(pkg, fetch_sources.GitRepo): if isinstance(pkg, fetch_sources.GitRepo):