nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 07:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

vulkan-tools-lunarg: 1.3.250 -> 1.3.261

Browse Source 
Diff: https://github.com/LunarG/VulkanTools/compare/v1.3.250...v1.3.261
This commit is contained in:
K900 2023-08-22 20:02:16 +03:00
parent 6c37d0f574
commit 8d8f1def21
3 changed files with 6 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/tools/graphics/vulkan-tools-lunarg/add-missing-macro-definition.patch
View File

@ -1,26 +0,0 @@
diff --git a/layersvt/api_dump.h b/layersvt/api_dump.h
index 6e13b6de3..33bee96e7 100644
--- a/layersvt/api_dump.h
+++ b/layersvt/api_dump.h
@@ -60,6 +60,8 @@
#include <unordered_set>
#include <utility>
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
#ifdef ANDROID
#include <android/log.h>
diff --git a/layersvt/screenshot.cpp b/layersvt/screenshot.cpp
index b9743371c..6ee65c576 100755
--- a/layersvt/screenshot.cpp
+++ b/layersvt/screenshot.cpp
@@ -44,6 +44,8 @@ using namespace std;
#include "screenshot_parsing.h"
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
#ifdef ANDROID
#include <android/log.h>

16
pkgs/tools/graphics/vulkan-tools-lunarg/default.nix
View File

@ -5,6 +5,7 @@
, python3
, jq
, expat
, jsoncpp
, libX11
, libXdmcp
, libXrandr
@ -24,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "vulkan-tools-lunarg";
version = "1.3.250";
version = "1.3.261";
src = fetchFromGitHub {
owner = "LunarG";
repo = "VulkanTools";
rev = "v${version}";
hash = "sha256-oI2ITvciuE/f8ojFpIwcH+HnYCasz43nKkER3wJxX+c=";
hash = "sha256-Kem3nWVaMeDEsidKYMsWr9Bu0yBgjjennDB0sKBDogA=";
fetchSubmodules = true;
};
@ -38,6 +39,7 @@ stdenv.mkDerivation rec {
buildInputs = [
expat
jsoncpp
libX11
libXdmcp
libXrandr
@ -70,6 +72,8 @@ stdenv.mkDerivation rec {
patchShebangs scripts/*
sed -i '/^git /d' $update
./$update
substituteInPlace via/CMakeLists.txt --replace "jsoncpp_static" "jsoncpp"
'';
# Include absolute paths to layer libraries in their associated
@ -82,14 +86,6 @@ stdenv.mkDerivation rec {
'';
patches = [
# Redefine an internal macro removed in vulkan-validation-layers
# FIXME: remove when fixed upstream
./add-missing-macro-definition.patch
# Skip QNX-specific extension causing build failures
# FIXME: remove when fixed upstream
./skip-qnx-extension.patch
./gtest.patch
];

13
pkgs/tools/graphics/vulkan-tools-lunarg/skip-qnx-extension.patch
View File

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 209f3ec39..c711af38b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,7 +190,7 @@ endif()
# Define macro used for building vk.xml generated files
function(run_vulkantools_vk_xml_generate dependency output)
add_custom_command(OUTPUT ${output}
- COMMAND ${PYTHON_CMD} -B ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py -registry ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/vk.xml -scripts ${VULKAN_HEADERS_REGISTRY_DIRECTORY} ${output}
+ COMMAND ${PYTHON_CMD} -B ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py -registry ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/vk.xml -scripts ${VULKAN_HEADERS_REGISTRY_DIRECTORY} ${output} -removeExtensions VK_QNX_external_memory_screen_buffer
DEPENDS ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/vk.xml ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/generator.py ${VULKANTOOLS_SCRIPTS_DIR}/${dependency} ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/reg.py
)
endfunction()