avery/vulkan-test
1
0
Fork 0
forked from pupbrained/vulkan-test
Code Pull requests Activity

are you serious. the issue was yabai.

Browse source
This commit is contained in:
Mars 2024-10-05 15:57:25 -04:00
parent 76fa86d622
commit 23bb6b871f
Signed by untrusted user: pupbrained
GPG key ID: 874E22DF2F9DFCB5
3 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
flake.lock
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1727065772, "lastModified": 1728001300,
"narHash": "sha256-U9baiEXL2YsS67QKlBAPIUq+OB+eUPKv8n1vGNdhiec=", "narHash": "sha256-W7PYJ6s+A91V1WZOTef8y3t1BGQKCfcLtHjOKcP5ScA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "989dc4cbf6a95f2e5fefc8cd61d2198a8fb6834a", "rev": "e00cc9f2fa7eaac3232e0de9b0b86dfd58b1f43c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -17,11 +17,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1726481836, "lastModified": 1726871744,
"narHash": "sha256-MWTBH4dd5zIz2iatDb8IkqSjIeFum9jAqkFxgHLdzO4=", "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "20f9370d5f588fb8c72e844c54511cab054b5f40", "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -58,11 +58,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1726734507, "lastModified": 1727984844,
"narHash": "sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4+N3L2w=", "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "ee41a466c2255a3abe6bc50fc6be927cdee57a9f", "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64",
"type": "github" "type": "github"
}, },
"original": { "original": {

10
flake.nix
View file

@ -24,8 +24,8 @@
stdenv = stdenv =
if pkgs.hostPlatform.isLinux if pkgs.hostPlatform.isLinux
then pkgs.stdenvAdapters.useMoldLinker pkgs.llvmPackages_18.libcxxStdenv then pkgs.stdenvAdapters.useMoldLinker pkgs.llvmPackages_19.libcxxStdenv
else pkgs.llvmPackages_18.libcxxStdenv; else pkgs.llvmPackages_19.libcxxStdenv;
sources = import ./_sources/generated.nix { sources = import ./_sources/generated.nix {
inherit (pkgs) fetchFromGitHub fetchgit fetchurl dockerTools; inherit (pkgs) fetchFromGitHub fetchgit fetchurl dockerTools;
@ -89,7 +89,7 @@
clang-format = { clang-format = {
enable = true; enable = true;
package = pkgs.llvmPackages_18.clang-tools; package = pkgs.llvmPackages_19.clang-tools;
}; };
}; };
}; };
@ -99,7 +99,7 @@
[ [
alejandra alejandra
bear bear
(llvmPackages_18.clang-tools.override {enableLibcxx = true;}) (llvmPackages_19.clang-tools.override {enableLibcxx = true;})
lldb lldb
meson meson
ninja ninja
@ -126,7 +126,7 @@
in "${linuxPackages_latest.nvidia_x11}/share/vulkan/icd.d/nvidia_icd.x86_64.json:${vulkanPaths}"; in "${linuxPackages_latest.nvidia_x11}/share/vulkan/icd.d/nvidia_icd.x86_64.json:${vulkanPaths}";
shellHook = '' shellHook = ''
export PATH="${llvmPackages_18.clang-tools.override {enableLibcxx = true;}}/bin:$PATH" export PATH="${llvmPackages_19.clang-tools.override {enableLibcxx = true;}}/bin:$PATH"
''; '';
name = "C++"; name = "C++";

9
src/main.cpp
View file

@ -110,6 +110,7 @@ class VulkanApp {
vkfw::WindowHints hints; vkfw::WindowHints hints;
hints.clientAPI = vkfw::ClientAPI::eNone; hints.clientAPI = vkfw::ClientAPI::eNone;
hints.resizable = false;
mWindow = vkfw::createWindowUnique(WIDTH, HEIGHT, "Vulkan", hints); mWindow = vkfw::createWindowUnique(WIDTH, HEIGHT, "Vulkan", hints);
} }
@ -597,8 +598,8 @@ class VulkanApp {
return mDevice->createShaderModuleUnique(createInfo); return mDevice->createShaderModuleUnique(createInfo);
} }
static fn chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats static fn chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats)
) -> vk::SurfaceFormatKHR { -> vk::SurfaceFormatKHR {
for (const auto& availableFormat : availableFormats) for (const auto& availableFormat : availableFormats)
if (availableFormat.format == vk::Format::eB8G8R8A8Srgb && if (availableFormat.format == vk::Format::eB8G8R8A8Srgb &&
availableFormat.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear) availableFormat.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear)
@ -607,8 +608,8 @@ class VulkanApp {
return availableFormats[0]; return availableFormats[0];
} }
static fn chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes static fn chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes)
) -> vk::PresentModeKHR { -> vk::PresentModeKHR {
for (const auto& availablePresentMode : availablePresentModes) for (const auto& availablePresentMode : availablePresentModes)
if (availablePresentMode == vk::PresentModeKHR::eMailbox) if (availablePresentMode == vk::PresentModeKHR::eMailbox)
return availablePresentMode; return availablePresentMode;