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

Merge pull request #32640 from Ralith/vulkan

Browse Source 
vulkan-loader: 1.0.42.2 -> 1.0.61.1
This commit is contained in:
Orivej Desh 2017-12-17 01:00:57 +00:00 committed by GitHub
commit 1b3f837002
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/glslang/default.nix
View File

@ -2,15 +2,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "glslang-git-${version}"; name = "glslang-git-${version}";
version = "2017-03-29"; version = "2017-08-31";
# `vulkan-loader` requires a specific version of `glslang` as specified in # `vulkan-loader` requires a specific version of `glslang` as specified in
# `<vulkan-loader-repo>/external_revisions/glslang_revision`. # `<vulkan-loader-repo>/external_revisions/glslang_revision`.
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "glslang"; repo = "glslang";
rev = "714e58b2fc5a45714596e6aa2f6ac8f64260365c"; rev = "3a21c880500eac21cdf79bef5b80f970a55ac6af";
sha256 = "0ihnd0c4mr6ppbv9g7z1abrn8vx66simfzx5q48nqcpnywn35jxv"; sha256 = "1i15m17r0acmzjrkybris2rgw15il05a4w5h7vhhsiyngcvajcyn";
}; };
buildInputs = [ cmake bison ]; buildInputs = [ cmake bison ];

11
pkgs/development/libraries/vulkan-loader/default.nix
View File

@ -3,12 +3,12 @@
libXext, wayland, mesa_noglu, makeWrapper }: libXext, wayland, mesa_noglu, makeWrapper }:
let let
version = "1.0.42.2"; version = "1.0.61.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "Vulkan-LoaderAndValidationLayers"; repo = "Vulkan-LoaderAndValidationLayers";
rev = "sdk-${version}"; rev = "sdk-${version}";
sha256 = "0na1ax2cgv6w29213mby56mndfsj3iizj3n5pbpy4s4p7ij9kdgn"; sha256 = "043kw6wnrpdplnb40x6n9rgf3gygsn9jiv91y458sydbhalfr945";
}; };
in in
@ -48,11 +48,12 @@ stdenv.mkDerivation rec {
sed -i "s:\\./lib:$out/lib/lib:g" "$out/share/vulkan/"*/*.json sed -i "s:\\./lib:$out/lib/lib:g" "$out/share/vulkan/"*/*.json
mkdir -p $dev/include mkdir -p $dev/include
cp -rv ../include $dev/ cp -rv ../include $dev/
mkdir -p $demos/share/vulkan-demos
cp demos/*.spv demos/*.ppm $demos/share/vulkan-demos
mkdir -p $demos/bin mkdir -p $demos/bin
cp demos/*.spv demos/*.ppm $demos/bin find demos -type f -executable -not -name vulkaninfo -exec cp -v {} $demos/bin \;
find demos -type f -executable -not -name vulkaninfo -exec cp {} $demos/bin \;
for p in cube cubepp; do for p in cube cubepp; do
wrapProgram $demos/bin/$p --run "cd $demos/bin" wrapProgram $demos/bin/$p --run "cd $demos/share/vulkan-demos"
done done
''; '';

10
pkgs/development/tools/spirv-tools/default.nix
View File

@ -8,14 +8,14 @@ spirv_sources = {
tools = fetchFromGitHub { tools = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "SPIRV-Tools"; repo = "SPIRV-Tools";
rev = "7fe8a57a5bd72094e91f9f93e51dac2f2461dcb4"; rev = "7e2d26c77b606b21af839b37fd21381c4a669f23";
sha256 = "0rh25y1k3m3f1nqs032lh3mng5qfw9kqn6xv9yzzm47i1i0b6hmr"; sha256 = "1nlzj081v1xdyfz30nfs8hfcnqd072fra127h46gav179f04kss2";
}; };
headers = fetchFromGitHub { headers = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "SPIRV-Headers"; repo = "SPIRV-Headers";
rev = "6c08995e6e7b94129e6086c78198c77111f2f262"; rev = "2bb92e6fe2c6aa410152fc6c63443f452acb1a65";
sha256 = "07m12wm9prib7hldj7pbc8vwnj0x6llgx4shzgy8x4xbhbafawws"; sha256 = "1rgjd7kpa7xpbwpzd6m3f6yq44s9xn5ddhz135213pxwbi5c0c26";
}; };
}; };
@ -23,7 +23,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "spirv-tools-${version}"; name = "spirv-tools-${version}";
version = "2017-03-23"; version = "2017-09-01";
src = spirv_sources.tools; src = spirv_sources.tools;
patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers''; patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers'';