cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update vulkan to SDK 1.2.162.0, including spirv-headers to 1.5.4 and

Browse Source 
spirv-tools to 2020.6.
tested by jsg@ and me, including validation layers by jsg@
ok jsg@
This commit is contained in:
thfr 2020-12-27 15:58:42 +00:00
parent 992f77c7f8
commit f68834e181
24 changed files with 86 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/spirv-headers/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2020/07/07 08:08:04 thfr Exp $
# $OpenBSD: Makefile,v 1.4 2020/12/27 15:58:42 thfr Exp $
COMMENT = SPIRV-Headers
V = 1.5.3
PKGNAME = spirv-headers-${V}
V = 1.5.4.raytracing.fixed
PKGNAME = spirv-headers-1.5.4pl1
GH_TAGNAME = ${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = SPIRV-Headers

4
graphics/spirv-headers/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (SPIRV-Headers-1.5.3.tar.gz) = 7s6KnhR9N5l9Ql1dLusudXrSWtww1mUUZwlPOxhgm1o=
SIZE (SPIRV-Headers-1.5.3.tar.gz) = 386853
SHA256 (SPIRV-Headers-1.5.4.raytracing.fixed.tar.gz) = 3yrSUgvk2VpHn6JIkhBliFu/Q1plg0mn/BZK17JraMY=
SIZE (SPIRV-Headers-1.5.4.raytracing.fixed.tar.gz) = 395500

4
graphics/spirv-headers/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2020/07/07 08:08:05 thfr Exp $
@comment $OpenBSD: PLIST,v 1.3 2020/12/27 15:58:42 thfr Exp $
include/spirv/
include/spirv/1.0/
include/spirv/1.0/GLSL.std.450.h
@ -47,11 +47,13 @@ include/spirv/unified1/AMD_shader_explicit_vertex_parameter.h
include/spirv/unified1/AMD_shader_trinary_minmax.h
include/spirv/unified1/DebugInfo.h
include/spirv/unified1/GLSL.std.450.h
include/spirv/unified1/NonSemanticClspvReflection.h
include/spirv/unified1/NonSemanticDebugPrintf.h
include/spirv/unified1/OpenCL.std.h
include/spirv/unified1/OpenCLDebugInfo100.h
include/spirv/unified1/extinst.debuginfo.grammar.json
include/spirv/unified1/extinst.glsl.std.450.grammar.json
include/spirv/unified1/extinst.nonsemantic.clspvreflection.grammar.json
include/spirv/unified1/extinst.nonsemantic.debugprintf.grammar.json
include/spirv/unified1/extinst.opencl.debuginfo.100.grammar.json
include/spirv/unified1/extinst.opencl.std.100.grammar.json

4
graphics/spirv-tools/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2020/07/07 08:08:05 thfr Exp $
# $OpenBSD: Makefile,v 1.6 2020/12/27 15:58:42 thfr Exp $
COMMENT = API and commands for processing SPIR-V
V = 2020.3
V = 2020.6
DISTNAME = spirv-tools-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = SPIRV-Tools

4
graphics/spirv-tools/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (spirv-tools-2020.3.tar.gz) = i1OKHLKkJ175YXq8sEfVToKS+XWsHZMyPV3R4ZyFKAs=
SIZE (spirv-tools-2020.3.tar.gz) = 2170858
SHA256 (spirv-tools-2020.6.tar.gz) = 3iOSaC343vesZmoqMgzUdXUbrfR5CwHHORt2ROy1UKM=
SIZE (spirv-tools-2020.6.tar.gz) = 2595300

13
graphics/spirv-tools/patches/patch-source_CMakeLists_txt
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-source_CMakeLists_txt,v 1.1 2020/07/07 08:08:05 thfr Exp $
Index: source/CMakeLists.txt
--- source/CMakeLists.txt.orig
+++ source/CMakeLists.txt
@@ -347,6 +347,7 @@ spvtools_pch(SPIRV_SOURCES pch_source)
add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES})
spvtools_default_compile_options(${SPIRV_TOOLS})
+target_include_directories(${SPIRV_TOOLS} BEFORE PRIVATE ${spirv-tools_SOURCE_DIR}/include)
target_include_directories(${SPIRV_TOOLS}
PUBLIC
$<BUILD_INTERFACE:${spirv-tools_SOURCE_DIR}/include>

15
graphics/spirv-tools/patches/patch-tools_CMakeLists_txt
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-tools_CMakeLists_txt,v 1.1 2020/07/07 08:08:05 thfr Exp $
prefer local include/spirv-tools over system includes from earlier version
Index: tools/CMakeLists.txt
--- tools/CMakeLists.txt.orig
+++ tools/CMakeLists.txt
@@ -53,6 +53,7 @@ if (NOT ${SPIRV_SKIP_EXECUTABLES})
cfg/bin_to_dot.h
cfg/bin_to_dot.cpp
LIBS ${SPIRV_TOOLS})
+ target_include_directories(spirv-cfg BEFORE PRIVATE ${spirv-tools_SOURCE_DIR}/include)
target_include_directories(spirv-cfg PRIVATE ${spirv-tools_SOURCE_DIR}
${SPIRV_HEADER_INCLUDE_DIR})
set(SPIRV_INSTALL_TARGETS spirv-as spirv-dis spirv-val spirv-opt

4
graphics/vulkan-headers/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.4 2020/07/07 08:08:06 thfr Exp $
# $OpenBSD: Makefile,v 1.5 2020/12/27 15:58:43 thfr Exp $
COMMENT = Vulkan header files
V = 1.2.141.0
V = 1.2.162.0
PKGNAME = vulkan-headers-${V}
GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup

4
graphics/vulkan-headers/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (Vulkan-Headers-sdk-1.2.141.0.tar.gz) = V50RJDPImsikqTdBv6bu6NykodgUU2OijW2ZZ7q8Kwc=
SIZE (Vulkan-Headers-sdk-1.2.141.0.tar.gz) = 756346
SHA256 (Vulkan-Headers-sdk-1.2.162.0.tar.gz) = 6w9qeaw44Tf1Wg4TZBFA5jt2XI7HF6Zb85BGFO91Q2U=
SIZE (Vulkan-Headers-sdk-1.2.162.0.tar.gz) = 853014

40
graphics/vulkan-headers/patches/patch-include_vulkan_vulkan_hpp
View File

@ -1,18 +1,18 @@
$OpenBSD: patch-include_vulkan_vulkan_hpp,v 1.1 2020/07/07 08:08:06 thfr Exp $
$OpenBSD: patch-include_vulkan_vulkan_hpp,v 1.2 2020/12/27 15:58:43 thfr Exp $
Index: include/vulkan/vulkan.hpp
--- include/vulkan/vulkan.hpp.orig
+++ include/vulkan/vulkan.hpp
@@ -66,7 +66,7 @@
@@ -67,7 +67,7 @@
#endif
#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1
-# if defined(__linux__) || defined(__APPLE__)
+# if defined(__unix__) || defined(__APPLE__)
# include <dlfcn.h>
# endif
#endif
@@ -83744,7 +83744,7 @@ namespace VULKAN_HPP_NAMESPACE
-# if defined( __linux__ ) || defined( __APPLE__ )
+# if defined( __unix__) || defined( __APPLE__ )
# include <dlfcn.h>
# elif defined( _WIN32 )
typedef struct HINSTANCE__ * HINSTANCE;
@@ -92342,7 +92342,7 @@ namespace VULKAN_HPP_NAMESPACE
{
if ( !vulkanLibraryName.empty() )
{
@ -20,8 +20,8 @@ Index: include/vulkan/vulkan.hpp
+# if defined( __unix__ ) || defined( __APPLE__ )
m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL );
# elif defined( _WIN32 )
m_library = detail::LoadLibraryA( vulkanLibraryName.c_str() );
@@ -83754,7 +83754,7 @@ namespace VULKAN_HPP_NAMESPACE
m_library = ::LoadLibraryA( vulkanLibraryName.c_str() );
@@ -92352,7 +92352,7 @@ namespace VULKAN_HPP_NAMESPACE
}
else
{
@ -30,7 +30,7 @@ Index: include/vulkan/vulkan.hpp
m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL );
if ( m_library == nullptr )
{
@@ -83801,7 +83801,7 @@ namespace VULKAN_HPP_NAMESPACE
@@ -92395,7 +92395,7 @@ namespace VULKAN_HPP_NAMESPACE
{
if ( m_library )
{
@ -38,8 +38,8 @@ Index: include/vulkan/vulkan.hpp
+# if defined( __unix__ ) || defined( __APPLE__ )
dlclose( m_library );
# elif defined( _WIN32 )
detail::FreeLibrary( m_library );
@@ -83814,7 +83814,7 @@ namespace VULKAN_HPP_NAMESPACE
::FreeLibrary( m_library );
@@ -92408,7 +92408,7 @@ namespace VULKAN_HPP_NAMESPACE
template <typename T>
T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT
{
@ -47,13 +47,13 @@ Index: include/vulkan/vulkan.hpp
+# if defined( __unix__ ) || defined( __APPLE__ )
return (T)dlsym( m_library, function );
# elif defined( _WIN32 )
return (T)detail::GetProcAddress( m_library, function );
@@ -83827,7 +83827,7 @@ namespace VULKAN_HPP_NAMESPACE
return (T)::GetProcAddress( m_library, function );
@@ -92420,7 +92420,7 @@ namespace VULKAN_HPP_NAMESPACE
bool success() const VULKAN_HPP_NOEXCEPT { return m_library != nullptr; }
private:
bool m_success;
-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( _WIN32 )
+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( _WIN32 )
-# if defined( __linux__ ) || defined( __APPLE__ )
+# if defined( __unix__ ) || defined( __APPLE__ )
void * m_library;
# else
# error unsupported platform
# elif defined( _WIN32 )
::HINSTANCE m_library;

4
graphics/vulkan-headers/patches/patch-registry_reg_py
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-registry_reg_py,v 1.2 2020/07/07 08:08:06 thfr Exp $
$OpenBSD: patch-registry_reg_py,v 1.3 2020/12/27 15:58:43 thfr Exp $
Index: registry/reg.py
--- registry/reg.py.orig
@ -7,5 +7,5 @@ Index: registry/reg.py
-#!/usr/bin/python3 -i
+#!/usr/bin/env python3 -i
#
# Copyright (c) 2013-2020 The Khronos Group Inc.
# Copyright 2013-2020 The Khronos Group Inc.
#

3
graphics/vulkan-headers/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2020/07/07 08:08:06 thfr Exp $
@comment $OpenBSD: PLIST,v 1.3 2020/12/27 15:58:43 thfr Exp $
include/vulkan/
include/vulkan/vk_icd.h
include/vulkan/vk_layer.h
@ -9,6 +9,7 @@ include/vulkan/vulkan.hpp
include/vulkan/vulkan_android.h
include/vulkan/vulkan_beta.h
include/vulkan/vulkan_core.h
include/vulkan/vulkan_directfb.h
include/vulkan/vulkan_fuchsia.h
include/vulkan/vulkan_ggp.h
include/vulkan/vulkan_ios.h

5
graphics/vulkan-loader/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2020/07/21 12:48:55 sthen Exp $
# $OpenBSD: Makefile,v 1.10 2020/12/27 15:58:43 thfr Exp $
# Integrated clang assembler doesn't work with x86 - Bug #698164
# remove if build can be updated to clang 9.0.0 (see
@ -7,12 +7,11 @@ BROKEN-i386 = clang integrated asm fails, https://github.com/KhronosGroup/Vulkan
COMMENT = Vulkan ICD loader
V = 1.2.141.0
V = 1.2.162.0
PKGNAME = vulkan-loader-${V}
GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = Vulkan-Loader
REVISION = 0
SHARED_LIBS += vulkan 0.1 # 1.2

4
graphics/vulkan-loader/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (Vulkan-Loader-sdk-1.2.141.0.tar.gz) = N2La2GrHPu/lpPhhsQ/THzIxjJiKCG2eLpW9bsgNfhU=
SIZE (Vulkan-Loader-sdk-1.2.141.0.tar.gz) = 1410533
SHA256 (Vulkan-Loader-sdk-1.2.162.0.tar.gz) = +PXsJIXn/bo/WMHN5aJRRezhxqaGyRukAWsowK8/Id0=
SIZE (Vulkan-Loader-sdk-1.2.162.0.tar.gz) = 1422604

4
graphics/vulkan-loader/patches/patch-CMakeLists_txt
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-CMakeLists_txt,v 1.3 2020/07/07 08:08:07 thfr Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.4 2020/12/27 15:58:43 thfr Exp $
Index: CMakeLists.txt
--- CMakeLists.txt.orig
@ -19,7 +19,7 @@ Index: CMakeLists.txt
CACHE
STRING
"Search path to use when XDG_DATA_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant."
@@ -124,6 +124,7 @@ if(UNIX AND NOT APPLE) # i.e.: Linux
@@ -125,6 +125,7 @@ if(UNIX AND NOT APPLE) # i.e.: Linux
if(BUILD_WSI_XCB_SUPPORT)
find_package(XCB REQUIRED)

19
graphics/vulkan-loader/patches/patch-loader_CMakeLists_txt
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-loader_CMakeLists_txt,v 1.4 2020/07/07 08:08:07 thfr Exp $
$OpenBSD: patch-loader_CMakeLists_txt,v 1.5 2020/12/27 15:58:43 thfr Exp $
don't define _XOPEN_SOURCE=500, otherwise alloca from stdlib.h isn't
visible and libvulkan won't run
@ -15,7 +15,7 @@ Index: loader/CMakeLists.txt
# Check for the existance of the secure_getenv or __secure_getenv commands
include(CheckFunctionExists)
@@ -170,7 +170,6 @@ else(UNIX AND NOT APPLE) # i.e.: Linux
@@ -193,7 +193,6 @@ else(UNIX AND NOT APPLE) # i.e.: Linux
target_link_libraries(asm_offset Vulkan::Headers)
add_custom_command(OUTPUT gen_defines.asm DEPENDS asm_offset COMMAND asm_offset GAS)
add_custom_target(loader_asm_gen_files DEPENDS gen_defines.asm)
@ -23,7 +23,7 @@ Index: loader/CMakeLists.txt
else()
message(WARNING "Could not find working x86 GAS assembler\n${ASM_FAILURE_MSG}")
set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} unknown_ext_chain.c)
@@ -264,7 +263,7 @@ else()
@@ -289,7 +288,7 @@ else()
add_library(vulkan-framework SHARED ${NORMAL_LOADER_SRCS} ${OPT_LOADER_SRCS} ${FRAMEWORK_HEADERS})
endif()
add_dependencies(vulkan-framework loader_asm_gen_files)
@ -32,12 +32,13 @@ Index: loader/CMakeLists.txt
target_link_libraries(vulkan-framework Vulkan::Headers)
# The FRAMEWORK_VERSION needs to be "A" here so that Xcode code-signing works when a user adds their framework to an Xcode
@@ -290,8 +289,6 @@ else()
@@ -314,9 +313,6 @@ else()
# cmake-format: on
endif()
if(NOT APPLE)
- if(NOT APPLE)
- target_compile_definitions(vulkan PRIVATE _XOPEN_SOURCE=500) # hush compiler warnings for readlink
-
# Generate pkg-config file.
include(FindPkgConfig QUIET)
if(PKG_CONFIG_FOUND)
- endif()
endif()
# Generate pkg-config file.

13
graphics/vulkan-loader/patches/patch-loader_loader_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-loader_loader_c,v 1.2 2020/07/07 08:08:07 thfr Exp $
$OpenBSD: patch-loader_loader_c,v 1.3 2020/12/27 15:58:43 thfr Exp $
revert commit ecb0b1e69fb2f4d3cae262e6da24c170ce62ae13 to attempt to
fix vulkaninfo
@ -6,16 +6,16 @@ fix vulkaninfo
Index: loader/loader.c
--- loader/loader.c.orig
+++ loader/loader.c
@@ -242,7 +242,7 @@ void *loader_device_heap_realloc(const struct loader_d
@@ -253,7 +253,7 @@ void *loader_device_heap_realloc(const struct loader_d
}
// Environment variables
-#if defined(__linux__) || defined(__APPLE__)
+#if defined(__linux__) || defined(__APPLE__) || defined(__unix__)
-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__)
+#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__unix__)
static inline bool IsHighIntegrity() {
return geteuid() != getuid() || getegid() != getgid();
@@ -7236,56 +7236,11 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_EnumerateDev
@@ -7538,53 +7538,11 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_EnumerateDev
struct loader_extension_list all_exts = {0};
struct loader_extension_list icd_exts = {0};
@ -46,7 +46,6 @@ Index: loader/loader.c
- if (pProperties == NULL) {
- *pPropertyCount = count;
- loader_destroy_generic_list(inst, (struct loader_generic_list *)&local_ext_list);
- loader_platform_thread_unlock_mutex(&loader_lock);
- return VK_SUCCESS;
- }
-
@ -58,14 +57,12 @@ Index: loader/loader.c
-
- loader_destroy_generic_list(inst, (struct loader_generic_list *)&local_ext_list);
- if (copy_size < count) {
- loader_platform_thread_unlock_mutex(&loader_lock);
- return VK_INCOMPLETE;
- }
- } else {
- loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
- "vkEnumerateDeviceExtensionProperties: pLayerName "
- "is too long or is badly formed");
- loader_platform_thread_unlock_mutex(&loader_lock);
- return VK_ERROR_EXTENSION_NOT_PRESENT;
- }
-

14
graphics/vulkan-loader/patches/patch-loader_vk_loader_platform_h
View File

@ -1,20 +1,20 @@
$OpenBSD: patch-loader_vk_loader_platform_h,v 1.2 2020/07/07 08:08:07 thfr Exp $
$OpenBSD: patch-loader_vk_loader_platform_h,v 1.3 2020/12/27 15:58:43 thfr Exp $
stub loader_platform_executable_path()
Index: loader/vk_loader_platform.h
--- loader/vk_loader_platform.h.orig
+++ loader/vk_loader_platform.h
@@ -31,7 +31,7 @@
@@ -35,7 +35,7 @@
#include "vulkan/vk_platform.h"
#include "vulkan/vk_sdk_platform.h"
-#if defined(__linux__) || defined(__APPLE__)
+#if defined(__unix__) || defined(__APPLE__)
-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__)
+#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__)
/* Linux-specific common code: */
// Headers:
@@ -117,6 +117,10 @@ static inline char *loader_platform_executable_path(ch
@@ -121,6 +121,10 @@ static inline char *loader_platform_executable_path(ch
if (ret <= 0) return NULL;
buffer[ret] = '\0';
return buffer;
@ -23,5 +23,5 @@ Index: loader/vk_loader_platform.h
+static inline char *loader_platform_executable_path(char *buffer, size_t size) {
+ return NULL;
}
#endif // defined (__APPLE__)
#elif defined(__Fuchsia__)
static inline char *loader_platform_executable_path(char *buffer, size_t size) { return NULL; }

4
graphics/vulkan-tools/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2020/07/07 08:08:07 thfr Exp $
# $OpenBSD: Makefile,v 1.6 2020/12/27 15:58:43 thfr Exp $
COMMENT = Vulkan Utilities and Tools
V = 1.2.141.0
V = 1.2.162.0
PKGNAME = vulkan-tools-${V}
GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup

4
graphics/vulkan-tools/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (Vulkan-Tools-sdk-1.2.141.0.tar.gz) = u638L6cuVfHc285eb/AQ7DsSQ8v2UsB03owqXpi0Js4=
SIZE (Vulkan-Tools-sdk-1.2.141.0.tar.gz) = 711771
SHA256 (Vulkan-Tools-sdk-1.2.162.0.tar.gz) = gySm39G8INT61FxOpWNX2DVPwD4+RSnQpJGfEk2eYQY=
SIZE (Vulkan-Tools-sdk-1.2.162.0.tar.gz) = 724402

4
graphics/vulkan-tools/patches/patch-cube_cube_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-cube_cube_cpp,v 1.2 2020/07/07 08:08:07 thfr Exp $
$OpenBSD: patch-cube_cube_cpp,v 1.3 2020/12/27 15:58:43 thfr Exp $
Index: cube/cube.cpp
--- cube/cube.cpp.orig
+++ cube/cube.cpp
@@ -2998,7 +2998,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre
@@ -3121,7 +3121,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre
return (int)msg.wParam;
}

12
graphics/vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-vulkaninfo_vulkaninfo_h,v 1.1 2020/07/07 08:08:07 thfr Exp $
$OpenBSD: patch-vulkaninfo_vulkaninfo_h,v 1.2 2020/12/27 15:58:43 thfr Exp $
Index: vulkaninfo/vulkaninfo.h
--- vulkaninfo/vulkaninfo.h.orig
+++ vulkaninfo/vulkaninfo.h
@@ -60,7 +60,11 @@
#include <windows.h>
@@ -66,7 +66,11 @@
#endif
#endif // _WIN32
-#if defined(__linux__) || defined(__APPLE__)
@ -16,7 +16,7 @@ Index: vulkaninfo/vulkaninfo.h
#include <dlfcn.h>
#endif
@@ -253,8 +257,11 @@ auto GetVector(const char *func_name, F &&f, Ts &&...
@@ -262,8 +266,11 @@ auto GetVector(const char *func_name, F &&f, Ts &&...
// ----------- Instance Setup ------- //
struct VkDll {
VkResult Initialize() {
@ -29,7 +29,7 @@ Index: vulkaninfo/vulkaninfo.h
if (!library) library = dlopen("libvulkan.so.1", RTLD_NOW | RTLD_LOCAL);
#elif defined(_WIN32)
library = LoadLibrary(TEXT("vulkan-1.dll"));
@@ -265,7 +272,7 @@ struct VkDll {
@@ -274,7 +281,7 @@ struct VkDll {
return VK_SUCCESS;
}
void Close() {
@ -38,7 +38,7 @@ Index: vulkaninfo/vulkaninfo.h
dlclose(library);
#elif defined(_WIN32)
FreeLibrary(library);
@@ -427,13 +434,13 @@ struct VkDll {
@@ -449,13 +456,13 @@ struct VkDll {
private:
template <typename T>
void Load(T &func_dest, const char *func_name) {

8
graphics/vulkan-validation-layers/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.5 2020/07/08 21:37:50 thfr Exp $
# $OpenBSD: Makefile,v 1.6 2020/12/27 15:58:43 thfr Exp $
COMMENT = Vulkan Validation Layers
V = 1.2.141.0
V = 1.2.162.0
PKGNAME = vulkan-validation-layers-${V}
GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = Vulkan-ValidationLayers
REVISION = 0
CATEGORIES = devel graphics
@ -33,7 +32,8 @@ BUILD_DEPENDS = graphics/glslang \
graphics/spirv-tools
CONFIGURE_ARGS += -DGLSLANG_INSTALL_DIR="${LOCALBASE}" \
-DBUILD_WSI_WAYLAND_SUPPORT=False
-DBUILD_WSI_WAYLAND_SUPPORT=False \
-DSPIRV_HEADERS_INSTALL_DIR=${LOCALBASE}/include/spirv
# Tests only build if Google Test framework is in directory external/
NO_TEST = Yes

4
graphics/vulkan-validation-layers/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (Vulkan-ValidationLayers-sdk-1.2.141.0.tar.gz) = CgBvmh+ic8HFS9NOVEBkrAj1FTtEnT3YA/NukVpoGJ0=
SIZE (Vulkan-ValidationLayers-sdk-1.2.141.0.tar.gz) = 2048159
SHA256 (Vulkan-ValidationLayers-sdk-1.2.162.0.tar.gz) = gKqeGAs5AFmBIdej6mE2ZbmariG7QCaOyv2C34AWxvU=
SIZE (Vulkan-ValidationLayers-sdk-1.2.162.0.tar.gz) = 2427779