JustForFun/rust_vulkan_test
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases Packages Wiki Activity Actions

First renderdoc run without wayland
Some checks failed
Build legacy Nix package on Ubuntu / build (push) Failing after 21m49s
Details

Browse source
This commit is contained in:
Florian RICHER 2025-03-22 21:51:21 +01:00
parent 1d0ef32f60
commit 30721773c8
Signed by: florian.richer
GPG key ID: C73D37CBED7BFC77
5 changed files with 35 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "rust_vulkan_test" name = "rust_vulkan_test"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2024"
authors = ["Florian RICHER <florian.richer@protonmail.com>"] authors = ["Florian RICHER <florian.richer@protonmail.com>"]
publish = false publish = false

12
flake.lock generated
View file

@ -44,11 +44,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1741865919, "lastModified": 1742546557,
"narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", "narHash": "sha256-QyhimDBaDBtMfRc7kyL28vo+HTwXRPq3hz+BgSJDotw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", "rev": "bfa9810ff7104a17555ab68ebdeafb6705f129b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -73,11 +73,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741919466, "lastModified": 1742524367,
"narHash": "sha256-xto0Oq+WItjDZvafo6ZVI4TZa6/2oxJHb0tkcSGVUJI=", "narHash": "sha256-KzTwk/5ETJavJZYV1DEWdCx05M4duFCxCpRbQSKWpng=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "8b137260b776525542d47d3a4dbac753df478a42", "rev": "70bf752d176b2ce07417e346d85486acea9040ef",
"type": "github" "type": "github"
}, },
"original": { "original": {

40
flake.nix
View file

@ -31,8 +31,17 @@
cargo = rust; cargo = rust;
}); });
renderdoc = pkgs.renderdoc.overrideAttrs(oldAttrs: {
cmakeFlags = oldAttrs.cmakeFlags ++ [
(pkgs.lib.cmakeBool "ENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND" true)
];
});
buildInputs = with pkgs; [ vulkan-headers vulkan-loader vulkan-validation-layers renderdoc ] buildInputs = with pkgs; [ vulkan-headers vulkan-loader vulkan-validation-layers renderdoc ]
++ pkgs.lib.optionals pkgs.stdenv.hostPlatform.isLinux (with pkgs; [ libxkbcommon wayland libGL ]) ++ pkgs.lib.optionals pkgs.stdenv.hostPlatform.isLinux (with pkgs; [
libxkbcommon wayland libGL # Wayland
xorg.libX11 xorg.libXcursor xorg.libXi xorg.libxcb xorg.libxshmfence # Xorg
])
++ pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin (with pkgs; [ darwin.apple_sdk.frameworks.SystemConfiguration ]); ++ pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin (with pkgs; [ darwin.apple_sdk.frameworks.SystemConfiguration ]);
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
@ -40,22 +49,25 @@
cmake cmake
python312 python312
]; ];
mkCustomShell = { packages ? [] }: pkgs.mkShell {
nativeBuildInputs = with pkgs; [
renderdoc
(rust.override { extensions = [ "rust-src" "rust-analyzer" ]; })
] ++ nativeBuildInputs;
buildInputs = buildInputs
++ packages;
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;
VK_LAYER_PATH = "${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d:${renderdoc}/share/vulkan/implicit_layer.d";
RUST_LOG = "info,rust_vulkan_test=trace";
};
in in
{ {
devShells = { devShells = {
default = pkgs.mkShell { default = mkCustomShell { packages = [ pkgs.nixgl.auto.nixVulkanNvidia pkgs.nixgl.nixVulkanMesa ]; };
nativeBuildInputs = with pkgs; [ nixos = mkCustomShell { };
renderdoc
(rust.override { extensions = [ "rust-src" "rust-analyzer" ]; })
] ++ nativeBuildInputs;
buildInputs = buildInputs
++ [ pkgs.nixgl.auto.nixVulkanNvidia pkgs.nixgl.nixVulkanMesa ];
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;
VK_LAYER_PATH = "${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d:${pkgs.renderdoc}/share/vulkan/implicit_layer.d";
RUST_LOG = "info,rust_vulkan_test=trace";
};
}; };
packages = { packages = {

2
rust-toolchain.toml
View file

@ -1,2 +1,2 @@
[toolchain] [toolchain]
channel = "1.85.0" channel = "1.85.1"

5
src/renderer/app.rs
View file

@ -54,10 +54,7 @@ impl App {
// (e.g. MoltenVK) // (e.g. MoltenVK)
flags: InstanceCreateFlags::ENUMERATE_PORTABILITY, flags: InstanceCreateFlags::ENUMERATE_PORTABILITY,
enabled_extensions: required_extensions, enabled_extensions: required_extensions,
enabled_layers: vec![ enabled_layers: vec![String::from("VK_LAYER_KHRONOS_validation")],
String::from("VK_LAYER_KHRONOS_validation"),
String::from("VK_LAYER_RENDERDOC_Capture"),
],
..Default::default() ..Default::default()
}, },
) )