On Sun, Apr 26, 2020 at 08:55:40PM -0600, Thomas Frohwein wrote:
> On Sun, Apr 26, 2020 at 01:42:50PM +1000, Jonathan Gray wrote:
> [...]
> >
> > Builds (with a warning about assembly path not being used on aarch64
> > but not amd64) after backporting a patch
> >
> > https://github.com/KhronosGroup/Vulkan-Loader/commit/85836796b3574fa8fa593a1da4d2a710f3467168.patch
> >
> > present upstream since sdk-1.1.121.0 tag, we are a few releases behind
> > at this point. Though updating the vulkan ports would be something for
> > after unlock at this point.
> >
> > sdk-1.1.108.0 20190612 vulkan ports are currently based on this
> > sdk-1.1.114.0 20190723
> > sdk-1.1.121.0 20190912
> > sdk-1.1.126.0 20191029
> > sdk-1.1.130.0 20191213
> > sdk-1.2.131.1 20200125
> > sdk-1.2.131.2 20200206
> > sdk-1.2.135.0 20200403
>
> Sorry, work is extremely unpredictable on my end with the pandemic situation.
> I'm hoping to find time to update vulkan ports after 6.7 is out, but in the
> meantime if you have a fix or update please don't wait for my ok to commit it.
>
> I'm still hoping to put some more work in keeping the vulkan stuff up to date
> when I can, especially with more consumers in ports and maturing of amdgpu...
>
> I work in healthcare, so right now it's really unpredictable how $dayjob
> workload will be at any point in time.
I mentioned releases not as a criticism but as part of trying to plan
possible updates as ports interdepend and I wasn't sure if going to 1.2
would cause any kind of breakage.
Here are updates for after unlock. A snapshot of spirv-headers is
required to build recent spirv-tools releases. Some changes for
include order with spirv-tools to fix building with an earlier release
already installed. And various other changes.
Briefly tested with vkcube, vulkaninfo and vkquake on amd64 with Intel
Broadwell/gen8 graphics.
glslang 7.11.3214 -> 8.13.3743
spirv-headers 1.4.1 -> 1.5.3alpha1 (c0df742ec0b8178ad58c68cff3437ad4b6a06e26)
spirv-tools 2019.3 -> 2020.2
vulkan-headers
vulkan-loader
vulkan-validation-layers
vulkan-tools
1.1.108.0 -> 1.2.135.0
Index: glslang/Makefile
===================================================================
RCS file: /cvs/ports/graphics/glslang/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- glslang/Makefile 27 Jul 2019 15:47:35 -0000 1.3
+++ glslang/Makefile 29 Apr 2020 11:47:44 -0000
@@ -2,7 +2,7 @@
COMMENT = reference front-end for GLSL and ESSL
-GH_TAGNAME = 7.11.3214
+GH_TAGNAME = 8.13.3743
GH_ACCOUNT = KhronosGroup
GH_PROJECT = glslang
Index: glslang/distinfo
===================================================================
RCS file: /cvs/ports/graphics/glslang/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- glslang/distinfo 22 Jun 2019 15:19:31 -0000 1.1.1.1
+++ glslang/distinfo 29 Apr 2020 11:47:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (glslang-7.11.3214.tar.gz) =
swtGaHNDKNJW4wyUA35g03dbEFV0PATY/XCfKWDzAqk=
-SIZE (glslang-7.11.3214.tar.gz) = 2841979
+SHA256 (glslang-8.13.3743.tar.gz) =
Y56+xW8adALy+glEaaXd6h7O7Pry6e/jYTdqD3On7i8=
+SIZE (glslang-8.13.3743.tar.gz) = 3183453
Index: glslang/patches/patch-Test_runtests
===================================================================
RCS file: glslang/patches/patch-Test_runtests
diff -N glslang/patches/patch-Test_runtests
--- glslang/patches/patch-Test_runtests 22 Jun 2019 15:19:31 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-Test_runtests,v 1.1.1.1 2019/06/22 15:19:31 thfr Exp $
-
-Index: Test/runtests
---- Test/runtests.orig
-+++ Test/runtests
-@@ -2,8 +2,8 @@
-
- TARGETDIR=localResults
- BASEDIR=baseResults
--EXE=../build/install/bin/glslangValidator
--REMAPEXE=../build/install/bin/spirv-remap
-+EXE=${WRKBUILD}/StandAlone/glslangValidator
-+REMAPEXE=${WRKBUILD}/StandAlone/spirv-remap
- HASERROR=0
- mkdir -p localResults
-
Index: glslang/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/glslang/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- glslang/pkg/PLIST 22 Jun 2019 15:19:31 -0000 1.1.1.1
+++ glslang/pkg/PLIST 29 Apr 2020 11:47:44 -0000
@@ -9,6 +9,7 @@ include/SPIRV/GLSL.ext.NV.h
include/SPIRV/GLSL.std.450.h
include/SPIRV/GlslangToSpv.h
include/SPIRV/Logger.h
+include/SPIRV/NonSemanticDebugPrintf.h
include/SPIRV/SPVRemapper.h
include/SPIRV/SpvBuilder.h
include/SPIRV/SpvTools.h
@@ -30,6 +31,8 @@ include/glslang/Include/ResourceLimits.h
include/glslang/Include/ShHandle.h
include/glslang/Include/Types.h
include/glslang/Include/arrays.h
+include/glslang/Include/glslang_c_interface.h
+include/glslang/Include/glslang_c_shader_types.h
include/glslang/Include/intermediate.h
include/glslang/Include/revision.h
include/glslang/MachineIndependent/
@@ -54,9 +57,44 @@ include/glslang/MachineIndependent/propa
include/glslang/MachineIndependent/reflection.h
include/glslang/Public/
include/glslang/Public/ShaderLang.h
-lib/libHLSL.a
-lib/libOGLCompiler.a
-lib/libOSDependent.a
-lib/libSPIRV.a
-lib/libSPVRemapper.a
-lib/libglslang.a
+include/glslang/SPIRV/
+include/glslang/SPIRV/GLSL.ext.AMD.h
+include/glslang/SPIRV/GLSL.ext.EXT.h
+include/glslang/SPIRV/GLSL.ext.KHR.h
+include/glslang/SPIRV/GLSL.ext.NV.h
+include/glslang/SPIRV/GLSL.std.450.h
+include/glslang/SPIRV/GlslangToSpv.h
+include/glslang/SPIRV/Logger.h
+include/glslang/SPIRV/NonSemanticDebugPrintf.h
+include/glslang/SPIRV/SPVRemapper.h
+include/glslang/SPIRV/SpvBuilder.h
+include/glslang/SPIRV/SpvTools.h
+include/glslang/SPIRV/bitutils.h
+include/glslang/SPIRV/disassemble.h
+include/glslang/SPIRV/doc.h
+include/glslang/SPIRV/hex_float.h
+include/glslang/SPIRV/spirv.hpp
+include/glslang/SPIRV/spvIR.h
+lib/cmake/
+lib/cmake/HLSLTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/HLSLTargets.cmake
+lib/cmake/OGLCompilerTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/OGLCompilerTargets.cmake
+lib/cmake/OSDependentTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/OSDependentTargets.cmake
+lib/cmake/SPIRVTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/SPIRVTargets.cmake
+lib/cmake/SPVRemapperTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/SPVRemapperTargets.cmake
+lib/cmake/glslangTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/glslangTargets.cmake
+lib/cmake/glslangValidatorTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/glslangValidatorTargets.cmake
+lib/cmake/spirv-remapTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/spirv-remapTargets.cmake
+@static-lib lib/libHLSL.a
+@static-lib lib/libOGLCompiler.a
+@static-lib lib/libOSDependent.a
+@static-lib lib/libSPIRV.a
+@static-lib lib/libSPVRemapper.a
+@static-lib lib/libglslang.a
Index: spirv-headers/Makefile
===================================================================
RCS file: /cvs/ports/graphics/spirv-headers/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- spirv-headers/Makefile 22 Jun 2019 16:51:06 -0000 1.2
+++ spirv-headers/Makefile 29 Apr 2020 11:47:48 -0000
@@ -2,9 +2,9 @@
COMMENT = SPIRV-Headers
-V = 1.4.1
-PKGNAME = spirv-headers-${V}
-GH_TAGNAME = ${V}
+V = 1.5.3alpha1
+DISTNAME = spirv-headers-${V}
+GH_COMMIT = c0df742ec0b8178ad58c68cff3437ad4b6a06e26
GH_ACCOUNT = KhronosGroup
GH_PROJECT = SPIRV-Headers
Index: spirv-headers/distinfo
===================================================================
RCS file: /cvs/ports/graphics/spirv-headers/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- spirv-headers/distinfo 22 Jun 2019 15:22:27 -0000 1.1.1.1
+++ spirv-headers/distinfo 29 Apr 2020 11:47:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (SPIRV-Headers-1.4.1.tar.gz) =
okTwYp9160UOCQzXc9MOIjZ8sjHpZMdJJYjrkAAgH9E=
-SIZE (SPIRV-Headers-1.4.1.tar.gz) = 359347
+SHA256 (spirv-headers-1.5.3alpha1-c0df742e.tar.gz) =
LpQGE1NkUaTpi97fB0tkiwGCw5HukUSnWHmOs6VDosQ=
+SIZE (spirv-headers-1.5.3alpha1-c0df742e.tar.gz) = 387520
Index: spirv-headers/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/spirv-headers/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- spirv-headers/pkg/PLIST 22 Jun 2019 15:22:27 -0000 1.1.1.1
+++ spirv-headers/pkg/PLIST 29 Apr 2020 11:47:48 -0000
@@ -41,10 +41,24 @@ include/spirv/1.2/spirv.lua
include/spirv/1.2/spirv.py
include/spirv/spir-v.xml
include/spirv/unified1/
+include/spirv/unified1/AMD_gcn_shader.h
+include/spirv/unified1/AMD_shader_ballot.h
+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/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.debugprintf.grammar.json
+include/spirv/unified1/extinst.opencl.debuginfo.100.grammar.json
include/spirv/unified1/extinst.opencl.std.100.grammar.json
+include/spirv/unified1/extinst.spv-amd-gcn-shader.grammar.json
+include/spirv/unified1/extinst.spv-amd-shader-ballot.grammar.json
+include/spirv/unified1/extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json
+include/spirv/unified1/extinst.spv-amd-shader-trinary-minmax.grammar.json
include/spirv/unified1/spirv.core.grammar.json
include/spirv/unified1/spirv.cs
include/spirv/unified1/spirv.h
@@ -54,3 +68,8 @@ include/spirv/unified1/spirv.json
include/spirv/unified1/spirv.lua
include/spirv/unified1/spirv.py
include/spirv/unified1/spv.d
+lib/cmake/
+lib/cmake/SPIRV-Headers/
+lib/cmake/SPIRV-Headers/SPIRV-HeadersConfig.cmake
+lib/cmake/SPIRV-Headers/SPIRV-HeadersConfigVersion.cmake
+lib/cmake/SPIRV-Headers/SPIRV-HeadersTargets.cmake
Index: spirv-tools/Makefile
===================================================================
RCS file: /cvs/ports/graphics/spirv-tools/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- spirv-tools/Makefile 21 Sep 2019 14:33:37 -0000 1.4
+++ spirv-tools/Makefile 29 Apr 2020 11:47:48 -0000
@@ -2,7 +2,7 @@
COMMENT = API and commands for processing SPIR-V
-V = 2019.3
+V = 2020.2
DISTNAME = spirv-tools-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = SPIRV-Tools
@@ -29,7 +29,7 @@ MODPY_VERSION = ${MODPY_DEFAULT_VERSION_
BUILD_DEPENDS = graphics/spirv-headers
-CONFIGURE_ARGS = -DSPIRV_HEADER_DIR="${LOCALBASE}"
+CONFIGURE_ARGS = -DSPIRV-Headers_SOURCE_DIR="${LOCALBASE}"
# effcee is missing to build tests
NO_TEST = Yes
Index: spirv-tools/distinfo
===================================================================
RCS file: /cvs/ports/graphics/spirv-tools/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- spirv-tools/distinfo 22 Jun 2019 15:24:31 -0000 1.1.1.1
+++ spirv-tools/distinfo 29 Apr 2020 11:47:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (spirv-tools-2019.3.tar.gz) =
V8WVhNgylKyRTBshUw+UQcKdMJeaVOXwqXsQcV3ELGQ=
-SIZE (spirv-tools-2019.3.tar.gz) = 1612835
+SHA256 (spirv-tools-2020.2.tar.gz) =
KfN29uvCTTzjnBqkcQHEtdJWyCR+QQaLVB3UO7iNQXQ=
+SIZE (spirv-tools-2020.2.tar.gz) = 2126892
Index: spirv-tools/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/spirv-tools/patches/patch-CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-CMakeLists_txt
--- spirv-tools/patches/patch-CMakeLists_txt 22 Jun 2019 15:24:31 -0000
1.1.1.1
+++ spirv-tools/patches/patch-CMakeLists_txt 29 Apr 2020 11:47:48 -0000
@@ -3,12 +3,12 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1.1.1
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -50,6 +50,8 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Android")
+@@ -53,6 +53,8 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Android")
set(SPIRV_TIMER_ENABLED ${SPIRV_ALLOW_TIMERS})
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
add_definitions(-DSPIRV_FREEBSD)
+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD")
+ add_definitions(-DSPIRV_OPENBSD)
+ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia")
+ add_definitions(-DSPIRV_FUCHSIA)
else()
- message(FATAL_ERROR "Your platform '${CMAKE_SYSTEM_NAME}' is not
supported!")
- endif()
Index: spirv-tools/patches/patch-external_CMakeLists_txt
===================================================================
RCS file: spirv-tools/patches/patch-external_CMakeLists_txt
diff -N spirv-tools/patches/patch-external_CMakeLists_txt
--- spirv-tools/patches/patch-external_CMakeLists_txt 22 Jun 2019 15:24:31
-0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-external_CMakeLists_txt,v 1.1.1.1 2019/06/22 15:24:31 thfr Exp
$
-
-Index: external/CMakeLists.txt
---- external/CMakeLists.txt.orig
-+++ external/CMakeLists.txt
-@@ -19,7 +19,7 @@ if (DEFINED SPIRV-Headers_SOURCE_DIR)
- else()
- if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Headers)
- set(SPIRV_HEADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Headers)
-- else()
-+ elseif(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/spirv-headers)
- set(SPIRV_HEADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/spirv-headers)
- endif()
- endif()
Index: spirv-tools/patches/patch-source_CMakeLists_txt
===================================================================
RCS file: spirv-tools/patches/patch-source_CMakeLists_txt
diff -N spirv-tools/patches/patch-source_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ spirv-tools/patches/patch-source_CMakeLists_txt 29 Apr 2020 11:47:48
-0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+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>
Index: spirv-tools/patches/patch-source_print_cpp
===================================================================
RCS file: /cvs/ports/graphics/spirv-tools/patches/patch-source_print_cpp,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-source_print_cpp
--- spirv-tools/patches/patch-source_print_cpp 22 Jun 2019 15:24:31 -0000
1.1.1.1
+++ spirv-tools/patches/patch-source_print_cpp 29 Apr 2020 11:47:48 -0000
@@ -3,12 +3,13 @@ $OpenBSD: patch-source_print_cpp,v 1.1.1
Index: source/print.cpp
--- source/print.cpp.orig
+++ source/print.cpp
-@@ -15,7 +15,7 @@
- #include "source/print.h"
+@@ -16,7 +16,8 @@
#if defined(SPIRV_ANDROID) || defined(SPIRV_LINUX) || defined(SPIRV_MAC) || \
-- defined(SPIRV_FREEBSD)
-+ defined(SPIRV_FREEBSD) || defined(SPIRV_OPENBSD)
+ defined(SPIRV_IOS) || defined(SPIRV_FREEBSD) || \
+- defined(SPIRV_EMSCRIPTEN) || defined(SPIRV_FUCHSIA)
++ defined(SPIRV_EMSCRIPTEN) || defined(SPIRV_FUCHSIA) || \
++ defined(SPIRV_OPENBSD)
namespace spvtools {
clr::reset::operator const char*() { return "\x1b[0m"; }
Index: spirv-tools/patches/patch-tools_CMakeLists_txt
===================================================================
RCS file: spirv-tools/patches/patch-tools_CMakeLists_txt
diff -N spirv-tools/patches/patch-tools_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ spirv-tools/patches/patch-tools_CMakeLists_txt 29 Apr 2020 11:47:48
-0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+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
Index: spirv-tools/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/spirv-tools/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- spirv-tools/pkg/PLIST 22 Jun 2019 15:24:31 -0000 1.1.1.1
+++ spirv-tools/pkg/PLIST 29 Apr 2020 11:47:48 -0000
@@ -6,7 +6,6 @@ bin/spirv-lesspipe.sh
@bin bin/spirv-link
@bin bin/spirv-opt
@bin bin/spirv-reduce
-@bin bin/spirv-stats
@bin bin/spirv-val
include/spirv-tools/
include/spirv-tools/instrument.hpp
@@ -14,10 +13,27 @@ include/spirv-tools/libspirv.h
include/spirv-tools/libspirv.hpp
include/spirv-tools/linker.hpp
include/spirv-tools/optimizer.hpp
-lib/libSPIRV-Tools-link.a
-lib/libSPIRV-Tools-opt.a
-lib/libSPIRV-Tools-reduce.a
-lib/libSPIRV-Tools-shared.so
-lib/libSPIRV-Tools.a
+lib/cmake/
+lib/cmake/SPIRV-Tools/
+lib/cmake/SPIRV-Tools-link/
+lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkConfig.cmake
+lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets.cmake
+lib/cmake/SPIRV-Tools-opt/
+lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optConfig.cmake
+lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake
+lib/cmake/SPIRV-Tools-reduce/
+lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceConfig.cmake
+lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget.cmake
+lib/cmake/SPIRV-Tools/SPIRV-ToolsConfig.cmake
+lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake
+@static-lib lib/libSPIRV-Tools-link.a
+@static-lib lib/libSPIRV-Tools-opt.a
+@static-lib lib/libSPIRV-Tools-reduce.a
+@so lib/libSPIRV-Tools-shared.so
+@static-lib lib/libSPIRV-Tools.a
lib/pkgconfig/SPIRV-Tools-shared.pc
lib/pkgconfig/SPIRV-Tools.pc
Index: vulkan-headers/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-headers/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- vulkan-headers/Makefile 22 Jun 2019 17:12:27 -0000 1.3
+++ vulkan-headers/Makefile 29 Apr 2020 11:47:49 -0000
@@ -2,12 +2,11 @@
COMMENT = Vulkan header files
-V = 1.1.108.0
+V = 1.2.135.0
PKGNAME = vulkan-headers-${V}
GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = Vulkan-Headers
-REVISION = 0
CATEGORIES = devel graphics
Index: vulkan-headers/distinfo
===================================================================
RCS file: /cvs/ports/graphics/vulkan-headers/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- vulkan-headers/distinfo 22 Jun 2019 15:26:43 -0000 1.1.1.1
+++ vulkan-headers/distinfo 29 Apr 2020 11:47:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-Headers-sdk-1.1.108.0.tar.gz) =
lE6IkR5H5dNLxDYOPlgzoNVQ4+dIPfonpfTThSWhuUM=
-SIZE (Vulkan-Headers-sdk-1.1.108.0.tar.gz) = 580538
+SHA256 (Vulkan-Headers-sdk-1.2.135.0.tar.gz) =
vvxpmR4eJo23WSHFd74yo/MV0B14s5t074e6aQh4e2M=
+SIZE (Vulkan-Headers-sdk-1.2.135.0.tar.gz) = 757133
Index: vulkan-headers/patches/patch-include_vulkan_vulkan_hpp
===================================================================
RCS file: vulkan-headers/patches/patch-include_vulkan_vulkan_hpp
diff -N vulkan-headers/patches/patch-include_vulkan_vulkan_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ vulkan-headers/patches/patch-include_vulkan_vulkan_hpp 29 Apr 2020
11:47:49 -0000
@@ -0,0 +1,50 @@
+$OpenBSD$
+
+Index: include/vulkan/vulkan.hpp
+--- include/vulkan/vulkan.hpp.orig
++++ include/vulkan/vulkan.hpp
+@@ -65,7 +65,7 @@
+ #endif
+
+ #if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1
+-# if defined(__linux__) || defined(__APPLE__)
++# if defined(__unix__) || defined(__APPLE__)
+ # include <dlfcn.h>
+ # endif
+
+@@ -81153,7 +81153,7 @@ namespace VULKAN_HPP_NAMESPACE
+ DynamicLoader() : m_success( false )
+ #endif
+ {
+-#if defined(__linux__)
++#if defined(__unix__)
+ m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL );
+ #elif defined(__APPLE__)
+ m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL );
+@@ -81195,7 +81195,7 @@ namespace VULKAN_HPP_NAMESPACE
+ {
+ if ( m_library )
+ {
+-#if defined(__linux__) || defined(__APPLE__)
++#if defined(__unix__) || defined(__APPLE__)
+ dlclose( m_library );
+ #elif defined(_WIN32)
+ FreeLibrary( m_library );
+@@ -81206,7 +81206,7 @@ namespace VULKAN_HPP_NAMESPACE
+ template <typename T>
+ T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT
+ {
+-#if defined(__linux__) || defined(__APPLE__)
++#if defined(__unix__) || defined(__APPLE__)
+ return (T)dlsym( m_library, function );
+ #elif defined(_WIN32)
+ return (T)GetProcAddress( m_library, function );
+@@ -81217,7 +81217,7 @@ namespace VULKAN_HPP_NAMESPACE
+
+ private:
+ bool m_success;
+-#if defined(__linux__) || defined(__APPLE__)
++#if defined(__unix__) || defined(__APPLE__)
+ void *m_library;
+ #elif defined(_WIN32)
+ HMODULE m_library;
Index: vulkan-headers/patches/patch-registry_cgenerator_py
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-headers/patches/patch-registry_cgenerator_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-registry_cgenerator_py
--- vulkan-headers/patches/patch-registry_cgenerator_py 22 Jun 2019 15:26:43
-0000 1.1.1.1
+++ vulkan-headers/patches/patch-registry_cgenerator_py 29 Apr 2020 11:47:49
-0000
@@ -7,5 +7,5 @@ Index: registry/cgenerator.py
-#!/usr/bin/python3 -i
+#!/usr/bin/env python3 -i
#
- # Copyright (c) 2013-2019 The Khronos Group Inc.
+ # Copyright (c) 2013-2020 The Khronos Group Inc.
#
Index: vulkan-headers/patches/patch-registry_conventions_py
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-headers/patches/patch-registry_conventions_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-registry_conventions_py
--- vulkan-headers/patches/patch-registry_conventions_py 22 Jun 2019
15:26:43 -0000 1.1.1.1
+++ vulkan-headers/patches/patch-registry_conventions_py 29 Apr 2020
11:47:49 -0000
@@ -7,5 +7,5 @@ Index: registry/conventions.py
-#!/usr/bin/python3 -i
+#!/usr/bin/env python3 -i
#
- # Copyright (c) 2013-2019 The Khronos Group Inc.
+ # Copyright (c) 2013-2020 The Khronos Group Inc.
#
Index: vulkan-headers/patches/patch-registry_generator_py
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-headers/patches/patch-registry_generator_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-registry_generator_py
--- vulkan-headers/patches/patch-registry_generator_py 22 Jun 2019 15:26:43
-0000 1.1.1.1
+++ vulkan-headers/patches/patch-registry_generator_py 29 Apr 2020 11:47:49
-0000
@@ -7,5 +7,5 @@ Index: registry/generator.py
-#!/usr/bin/python3 -i
+#!/usr/bin/env python3 -i
#
- # Copyright (c) 2013-2019 The Khronos Group Inc.
+ # Copyright (c) 2013-2020 The Khronos Group Inc.
#
Index: vulkan-headers/patches/patch-registry_genvk_py
===================================================================
RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_genvk_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-registry_genvk_py
--- vulkan-headers/patches/patch-registry_genvk_py 22 Jun 2019 15:26:43
-0000 1.1.1.1
+++ vulkan-headers/patches/patch-registry_genvk_py 29 Apr 2020 11:47:49
-0000
@@ -7,5 +7,5 @@ Index: registry/genvk.py
-#!/usr/bin/python3
+#!/usr/bin/env python3
#
- # Copyright (c) 2013-2019 The Khronos Group Inc.
+ # Copyright (c) 2013-2020 The Khronos Group Inc.
#
Index: vulkan-headers/patches/patch-registry_reg_py
===================================================================
RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_reg_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-registry_reg_py
--- vulkan-headers/patches/patch-registry_reg_py 22 Jun 2019 15:26:43
-0000 1.1.1.1
+++ vulkan-headers/patches/patch-registry_reg_py 29 Apr 2020 11:47:49
-0000
@@ -7,5 +7,5 @@ Index: registry/reg.py
-#!/usr/bin/python3 -i
+#!/usr/bin/env python3 -i
#
- # Copyright (c) 2013-2019 The Khronos Group Inc.
+ # Copyright (c) 2013-2020 The Khronos Group Inc.
#
Index: vulkan-headers/patches/patch-registry_vkconventions_py
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-headers/patches/patch-registry_vkconventions_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-registry_vkconventions_py
--- vulkan-headers/patches/patch-registry_vkconventions_py 22 Jun 2019
15:26:43 -0000 1.1.1.1
+++ vulkan-headers/patches/patch-registry_vkconventions_py 29 Apr 2020
11:47:49 -0000
@@ -7,5 +7,5 @@ Index: registry/vkconventions.py
-#!/usr/bin/python3 -i
+#!/usr/bin/env python3 -i
#
- # Copyright (c) 2013-2019 The Khronos Group Inc.
+ # Copyright (c) 2013-2020 The Khronos Group Inc.
#
Index: vulkan-headers/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/vulkan-headers/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- vulkan-headers/pkg/PLIST 22 Jun 2019 15:26:43 -0000 1.1.1.1
+++ vulkan-headers/pkg/PLIST 29 Apr 2020 11:47:49 -0000
@@ -7,6 +7,7 @@ include/vulkan/vk_sdk_platform.h
include/vulkan/vulkan.h
include/vulkan/vulkan.hpp
include/vulkan/vulkan_android.h
+include/vulkan/vulkan_beta.h
include/vulkan/vulkan_core.h
include/vulkan/vulkan_fuchsia.h
include/vulkan/vulkan_ggp.h
@@ -26,6 +27,8 @@ share/vulkan/registry/conventions.py
share/vulkan/registry/generator.py
share/vulkan/registry/genvk.py
share/vulkan/registry/reg.py
+share/vulkan/registry/spec_tools/
+share/vulkan/registry/spec_tools/util.py
share/vulkan/registry/validusage.json
share/vulkan/registry/vk.xml
share/vulkan/registry/vkconventions.py
Index: vulkan-loader/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-loader/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- vulkan-loader/Makefile 29 Apr 2020 04:11:29 -0000 1.5
+++ vulkan-loader/Makefile 29 Apr 2020 11:47:49 -0000
@@ -2,14 +2,13 @@
COMMENT = Vulkan ICD loader
-V = 1.1.108.0
+V = 1.2.135.0
PKGNAME = vulkan-loader-${V}
GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = Vulkan-Loader
-REVISION = 0
-SHARED_LIBS += vulkan 0.0 # 1.1
+SHARED_LIBS += vulkan 0.1 # 1.2
CATEGORIES = devel graphics
@@ -38,7 +37,5 @@ NO_TEST = Yes
pre-configure:
${SUBST_CMD} ${WRKSRC}/CMakeLists.txt
- cp ${WRKSRC}/loader/unknown_ext_chain_gas.asm \
- ${WRKSRC}/loader/unknown_ext_chain_gas.S
.include <bsd.port.mk>
Index: vulkan-loader/distinfo
===================================================================
RCS file: /cvs/ports/graphics/vulkan-loader/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- vulkan-loader/distinfo 22 Jun 2019 15:28:42 -0000 1.1.1.1
+++ vulkan-loader/distinfo 29 Apr 2020 11:47:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-Loader-sdk-1.1.108.0.tar.gz) =
z4yJZbUd20zJBdT3NwMk3lThc2ao36+WwKki6cMtOBc=
-SIZE (Vulkan-Loader-sdk-1.1.108.0.tar.gz) = 1342959
+SHA256 (Vulkan-Loader-sdk-1.2.135.0.tar.gz) =
mM0Z5GA8pqzFQnaGUW0Ku/UCas9RnZ5A+BNqz4Cc0Rc=
+SIZE (Vulkan-Loader-sdk-1.2.135.0.tar.gz) = 1406699
Index: vulkan-loader/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/vulkan-loader/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-CMakeLists_txt
--- vulkan-loader/patches/patch-CMakeLists_txt 22 Jun 2019 17:02:24 -0000
1.2
+++ vulkan-loader/patches/patch-CMakeLists_txt 29 Apr 2020 11:47:49 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.2 201
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -77,13 +77,13 @@ set(LOADER_HELPER_FOLDER "Helper Targets")
+@@ -92,13 +92,13 @@ set(LOADER_HELPER_FOLDER "Helper Targets")
if(UNIX)
set(
@@ -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."
-@@ -97,6 +97,7 @@ if(UNIX AND NOT APPLE) # i.e.: Linux
+@@ -118,6 +118,7 @@ if(UNIX AND NOT APPLE) # i.e.: Linux
if(BUILD_WSI_XCB_SUPPORT)
find_package(XCB REQUIRED)
Index: vulkan-loader/patches/patch-loader_CMakeLists_txt
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-loader/patches/patch-loader_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-loader_CMakeLists_txt
--- vulkan-loader/patches/patch-loader_CMakeLists_txt 29 Apr 2020 04:11:29
-0000 1.2
+++ vulkan-loader/patches/patch-loader_CMakeLists_txt 29 Apr 2020 11:47:49
-0000
@@ -2,9 +2,6 @@ $OpenBSD: patch-loader_CMakeLists_txt,v
Avoid vulkan-validation-layers vk_loader_platform.h being used.
-loader: move to using gcc for asm compiles on Linux.
-85836796b3574fa8fa593a1da4d2a710f3467168
-
Index: loader/CMakeLists.txt
--- loader/CMakeLists.txt.orig
+++ loader/CMakeLists.txt
@@ -12,47 +9,8 @@ Index: loader/CMakeLists.txt
# limitations under the License.
# ~~~
--include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${PROJECT_BINARY_DIR} ${CMAKE_BINARY_DIR})
-+include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_BINARY_DIR} ${CMAKE_BINARY_DIR})
+-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/generated ${CMAKE_CURRENT_BINARY_DIR})
++include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/generated ${CMAKE_CURRENT_BINARY_DIR})
# Check for the existance of the secure_getenv or __secure_getenv commands
include(CheckFunctionExists)
-@@ -148,22 +148,16 @@ elseif(APPLE)
- set_source_files_properties(${OPT_LOADER_SRCS} PROPERTIES COMPILE_FLAGS
-O)
- add_custom_target(loader_asm_gen_files) # This causes no assembly files
to be generated.
- else(UNIX AND NOT APPLE) # i.e.: Linux
-- enable_language(ASM-ATT)
-- set(CMAKE_ASM-ATT_COMPILE_FLAGS "${CMAKE_ASM-ATT_COMPILE_FLAGS}
$ENV{ASFLAGS}")
-- set(CMAKE_ASM-ATT_COMPILE_FLAGS "${CMAKE_ASM-ATT_COMPILE_FLAGS}
-I\"${CMAKE_CURRENT_BINARY_DIR}\"")
-+ enable_language(ASM)
-+ set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS}")
-
-- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/asm_test.asm
-+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/asm_test.S
- ".intel_syntax noprefix\n.text\n.global sample\nsample:\nmov
ecx, [eax + 16]\n")
-- # try_compile uses the C/C++ linker flags even for ASM,
-- # while they're not valid for ASM and making linking fail.
-- set(TMP_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
-- set(CMAKE_EXE_LINKER_FLAGS "")
-- try_compile(ASSEMBLER_WORKS ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/asm_test.asm)
-- set(CMAKE_EXE_LINKER_FLAGS ${TMP_EXE_LINKER_FLAGS})
-- file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/asm_test.asm)
-+ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
-+ try_compile(ASSEMBLER_WORKS ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/asm_test.S)
-+ file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/asm_test.S)
- if(ASSEMBLER_WORKS)
-- set(CMAKE_ASM-ATT_FLAGS "$ENV{ASFLAGS}
-I\"${CMAKE_CURRENT_BINARY_DIR}\"")
-- set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} unknown_ext_chain_gas.asm)
-+ set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} unknown_ext_chain_gas.S)
- add_executable(asm_offset asm_offset.c)
- add_dependencies(asm_offset generate_helper_files loader_gen_files)
- target_link_libraries(asm_offset Vulkan::Headers)
-@@ -247,7 +241,7 @@ else()
- "1"
- VERSION
-
"${VulkanHeaders_VERSION_MAJOR}.${VulkanHeaders_VERSION_MINOR}.${VulkanHeaders_VERSION_PATCH}")
-- target_link_libraries(vulkan -ldl -lpthread -lm)
-+ target_link_libraries(vulkan -lpthread -lm)
- target_link_libraries(vulkan Vulkan::Headers)
-
- if(APPLE)
Index: vulkan-loader/patches/patch-loader_loader_c
===================================================================
RCS file: /cvs/ports/graphics/vulkan-loader/patches/patch-loader_loader_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-loader_loader_c
--- vulkan-loader/patches/patch-loader_loader_c 22 Jun 2019 15:28:42 -0000
1.1.1.1
+++ vulkan-loader/patches/patch-loader_loader_c 29 Apr 2020 11:47:49 -0000
@@ -6,16 +6,16 @@ fix vulkaninfo
Index: loader/loader.c
--- loader/loader.c.orig
+++ loader/loader.c
-@@ -229,7 +229,7 @@ void *loader_device_heap_realloc(const struct loader_d
+@@ -234,7 +234,7 @@ void *loader_device_heap_realloc(const struct loader_d
}
// Environment variables
-#if defined(__linux__) || defined(__APPLE__)
+#if defined(__linux__) || defined(__APPLE__) || defined(__unix__)
- static inline char *loader_getenv(const char *name, const struct
loader_instance *inst) {
- // No allocation of memory necessary for Linux, but we should at least
touch
-@@ -6756,56 +6756,11 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_EnumerateDev
+ static inline bool IsHighIntegrity() {
+ return geteuid() != getuid() || getegid() != getgid();
+@@ -7017,56 +7017,11 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_EnumerateDev
struct loader_extension_list all_exts = {0};
struct loader_extension_list icd_exts = {0};
Index: vulkan-loader/patches/patch-loader_trampoline_c
===================================================================
RCS file: /cvs/ports/graphics/vulkan-loader/patches/patch-loader_trampoline_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-loader_trampoline_c
--- vulkan-loader/patches/patch-loader_trampoline_c 22 Jun 2019 15:28:42
-0000 1.1.1.1
+++ vulkan-loader/patches/patch-loader_trampoline_c 29 Apr 2020 11:47:49
-0000
@@ -6,7 +6,7 @@ fix vulkaninfo
Index: loader/trampoline.c
--- loader/trampoline.c.orig
+++ loader/trampoline.c
-@@ -778,17 +778,61 @@ LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumera
+@@ -796,17 +796,61 @@ LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumera
VkExtensionProperties *pProperties) {
VkResult res = VK_SUCCESS;
struct loader_physical_device_tramp *phys_dev;
Index: vulkan-tools/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-tools/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- vulkan-tools/Makefile 16 Aug 2019 15:31:23 -0000 1.3
+++ vulkan-tools/Makefile 29 Apr 2020 11:47:49 -0000
@@ -2,7 +2,7 @@
COMMENT = Vulkan Utilities and Tools
-V = 1.1.108.0
+V = 1.2.135.0
PKGNAME = vulkan-tools-${V}
GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
Index: vulkan-tools/distinfo
===================================================================
RCS file: /cvs/ports/graphics/vulkan-tools/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- vulkan-tools/distinfo 22 Jun 2019 15:30:16 -0000 1.1.1.1
+++ vulkan-tools/distinfo 29 Apr 2020 11:47:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-Tools-sdk-1.1.108.0.tar.gz) =
zZMlNG1TX8b9W2qws+UsjvkcrcU02NtylwB0Xxi6Vng=
-SIZE (Vulkan-Tools-sdk-1.1.108.0.tar.gz) = 615856
+SHA256 (Vulkan-Tools-sdk-1.2.135.0.tar.gz) =
g63XtjkKseubcRBrUNf1rmr7dDdHYvACivyf3vU4DIM=
+SIZE (Vulkan-Tools-sdk-1.2.135.0.tar.gz) = 710085
Index: vulkan-tools/patches/patch-cube_cube_cpp
===================================================================
RCS file: /cvs/ports/graphics/vulkan-tools/patches/patch-cube_cube_cpp,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-cube_cube_cpp
--- vulkan-tools/patches/patch-cube_cube_cpp 22 Jun 2019 15:30:16 -0000
1.1.1.1
+++ vulkan-tools/patches/patch-cube_cube_cpp 29 Apr 2020 11:47:49 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-cube_cube_cpp,v 1.1.1.1
Index: cube/cube.cpp
--- cube/cube.cpp.orig
+++ cube/cube.cpp
-@@ -2975,7 +2975,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre
+@@ -2999,7 +2999,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre
return (int)msg.wParam;
}
Index: vulkan-tools/patches/patch-icd_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/vulkan-tools/patches/patch-icd_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-icd_CMakeLists_txt
--- vulkan-tools/patches/patch-icd_CMakeLists_txt 22 Jun 2019 15:30:16
-0000 1.1.1.1
+++ vulkan-tools/patches/patch-icd_CMakeLists_txt 29 Apr 2020 11:47:49
-0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-icd_CMakeLists_txt,v 1.1
Index: icd/CMakeLists.txt
--- icd/CMakeLists.txt.orig
+++ icd/CMakeLists.txt
-@@ -38,6 +38,8 @@ elseif(APPLE)
+@@ -24,6 +24,8 @@ elseif(APPLE)
elseif(UNIX AND NOT APPLE) # i.e. Linux
if(BUILD_WSI_XCB_SUPPORT)
add_definitions(-DVK_USE_PLATFORM_XCB_KHR -DVK_USE_PLATFORM_XCB_KHX)
Index: vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h
===================================================================
RCS file: vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h
diff -N vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ vulkan-tools/patches/patch-vulkaninfo_vulkaninfo_h 29 Apr 2020 11:47:49
-0000
@@ -0,0 +1,56 @@
+$OpenBSD$
+
+Index: vulkaninfo/vulkaninfo.h
+--- vulkaninfo/vulkaninfo.h.orig
++++ vulkaninfo/vulkaninfo.h
+@@ -60,7 +60,11 @@
+ #include <windows.h>
+ #endif // _WIN32
+
+-#if defined(__linux__) || defined(__APPLE__)
++#if defined(__unix__) && !defined(__APPLE__)
++#define USE_DLOPEN 1
++#endif
++
++#if defined(USE_DLOPEN)
+ #include <dlfcn.h>
+ #endif
+
+@@ -253,8 +257,11 @@ auto GetVector(const char *func_name, F &&f, Ts &&...
+ // ----------- Instance Setup ------- //
+ struct VkDll {
+ VkResult Initialize() {
+-#if defined(__linux__)
++#if defined(__OpenBSD__)
+ library = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
++ if (!library) library = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
++#elif defined(USE_DLOPEN)
++ library = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
+ 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 {
+ return VK_SUCCESS;
+ }
+ void Close() {
+-#if defined(__linux__)
++#if defined(USE_DLOPEN)
+ dlclose(library);
+ #elif defined(_WIN32)
+ FreeLibrary(library);
+@@ -427,13 +434,13 @@ struct VkDll {
+ private:
+ template <typename T>
+ void Load(T &func_dest, const char *func_name) {
+-#if defined(__linux__)
++#if defined(USE_DLOPEN)
+ func_dest = reinterpret_cast<T>(dlsym(library, func_name));
+ #elif defined(_WIN32)
+ func_dest = reinterpret_cast<T>(GetProcAddress(library, func_name));
+ #endif
+ }
+-#if defined(__linux__)
++#if defined(USE_DLOPEN)
+ void *library;
+ #elif defined(_WIN32)
+ HMODULE library;
Index: vulkan-validation-layers/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-validation-layers/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- vulkan-validation-layers/Makefile 16 Aug 2019 15:31:23 -0000 1.3
+++ vulkan-validation-layers/Makefile 29 Apr 2020 11:47:49 -0000
@@ -2,7 +2,7 @@
COMMENT = Vulkan Validation Layers
-V = 1.1.108.0
+V = 1.2.135.0
PKGNAME = vulkan-validation-layers-${V}
GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
Index: vulkan-validation-layers/distinfo
===================================================================
RCS file: /cvs/ports/graphics/vulkan-validation-layers/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- vulkan-validation-layers/distinfo 22 Jun 2019 15:32:36 -0000 1.1.1.1
+++ vulkan-validation-layers/distinfo 29 Apr 2020 11:47:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-ValidationLayers-sdk-1.1.108.0.tar.gz) =
fihiF8sOg6hrVj25w/lATYT738rNeXboZfYW6+z+WBE=
-SIZE (Vulkan-ValidationLayers-sdk-1.1.108.0.tar.gz) = 1187826
+SHA256 (Vulkan-ValidationLayers-sdk-1.2.135.0.tar.gz) =
ejOqE9lSbaTeuUWzzPW+nPPJn7TfziyvV2QHRsHGSNM=
+SIZE (Vulkan-ValidationLayers-sdk-1.2.135.0.tar.gz) = 1980283
Index: vulkan-validation-layers/patches/patch-CMakeLists_txt
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-validation-layers/patches/patch-CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-CMakeLists_txt
--- vulkan-validation-layers/patches/patch-CMakeLists_txt 22 Jun 2019
15:32:36 -0000 1.1.1.1
+++ vulkan-validation-layers/patches/patch-CMakeLists_txt 29 Apr 2020
11:47:49 -0000
@@ -1,12 +1,9 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2019/06/22 15:32:36 thfr Exp $
-bundled headers should go before system headers which may be from old
-version (VulkanHeaders_INCLUDE_DIR is picked up as /usr/local/include)
-
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -90,6 +90,7 @@ if(UNIX AND NOT APPLE) # i.e. Linux
+@@ -95,6 +95,7 @@ if(UNIX AND NOT APPLE) # i.e. Linux
if(BUILD_WSI_XCB_SUPPORT)
find_package(XCB REQUIRED)
@@ -14,18 +11,3 @@ Index: CMakeLists.txt
endif()
if(BUILD_WSI_XLIB_SUPPORT)
-@@ -344,11 +345,11 @@ install(TARGETS VkLayer_utils DESTINATION ${CMAKE_INST
- set_target_properties(VkLayer_utils PROPERTIES LINKER_LANGUAGE CXX)
- add_dependencies(VkLayer_utils VulkanVL_generate_helper_files)
- target_include_directories(VkLayer_utils
-- PUBLIC ${VulkanHeaders_INCLUDE_DIR}
-- ${CMAKE_CURRENT_SOURCE_DIR}/layers
-+ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/layers
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}/layers
-- ${PROJECT_BINARY_DIR})
-+ ${PROJECT_BINARY_DIR}
-+ ${VulkanHeaders_INCLUDE_DIR})
-
- # uninstall target
---------------------------------------------------------------------------------------------------------------
- if(NOT TARGET uninstall)
Index: vulkan-validation-layers/patches/patch-layers_CMakeLists_txt
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-validation-layers/patches/patch-layers_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-layers_CMakeLists_txt
--- vulkan-validation-layers/patches/patch-layers_CMakeLists_txt 22 Jun
2019 15:32:36 -0000 1.1.1.1
+++ vulkan-validation-layers/patches/patch-layers_CMakeLists_txt 29 Apr
2020 11:47:49 -0000
@@ -5,12 +5,12 @@ include build dir before VulkanHeaders_I
Index: layers/CMakeLists.txt
--- layers/CMakeLists.txt.orig
+++ layers/CMakeLists.txt
-@@ -152,7 +152,7 @@ else(UNIX AND NOT APPLE) # i.e.: Linux
+@@ -137,7 +137,7 @@ else(UNIX AND NOT APPLE) # i.e.: Linux
endmacro()
endif()
--include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${VulkanHeaders_INCLUDE_DIR})
-+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_BINARY_DIR}
${VulkanHeaders_INCLUDE_DIR})
+-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/generated ${VulkanHeaders_INCLUDE_DIR})
++include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/generated ${VulkanHeaders_INCLUDE_DIR})
if(WIN32)
# Applies to all configurations
Index: vulkan-validation-layers/patches/patch-layers_vk_loader_platform_h
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-validation-layers/patches/patch-layers_vk_loader_platform_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-layers_vk_loader_platform_h
--- vulkan-validation-layers/patches/patch-layers_vk_loader_platform_h 22 Jun
2019 15:32:36 -0000 1.1.1.1
+++ vulkan-validation-layers/patches/patch-layers_vk_loader_platform_h 29 Apr
2020 11:47:49 -0000
@@ -3,8 +3,8 @@ $OpenBSD: patch-layers_vk_loader_platfor
Index: layers/vk_loader_platform.h
--- layers/vk_loader_platform.h.orig
+++ layers/vk_loader_platform.h
-@@ -31,7 +31,7 @@
- #include "vulkan/vk_platform.h"
+@@ -33,7 +33,7 @@
+ #undef NOMINMAX
#include "vulkan/vk_sdk_platform.h"
-#if defined(__linux__) || defined(__APPLE__)
Index: vulkan-validation-layers/patches/patch-layers_vk_mem_alloc_h
===================================================================
RCS file:
/cvs/ports/graphics/vulkan-validation-layers/patches/patch-layers_vk_mem_alloc_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-layers_vk_mem_alloc_h
--- vulkan-validation-layers/patches/patch-layers_vk_mem_alloc_h 22 Jun
2019 15:32:36 -0000 1.1.1.1
+++ vulkan-validation-layers/patches/patch-layers_vk_mem_alloc_h 29 Apr
2020 11:47:49 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-layers_vk_mem_alloc_h,v
Index: layers/vk_mem_alloc.h
--- layers/vk_mem_alloc.h.orig
+++ layers/vk_mem_alloc.h
-@@ -3179,7 +3179,7 @@ void *aligned_alloc(size_t alignment, size_t size)
+@@ -3180,7 +3180,7 @@ void *aligned_alloc(size_t alignment, size_t size)
return memalign(alignment, size);
}
Index: vulkan-validation-layers/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/vulkan-validation-layers/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- vulkan-validation-layers/pkg/PLIST 22 Jun 2019 15:32:36 -0000 1.1.1.1
+++ vulkan-validation-layers/pkg/PLIST 29 Apr 2020 11:47:49 -0000
@@ -1,41 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2019/06/22 15:32:36 thfr Exp $
-include/cast_utils.h
-include/hash_util.h
-include/hash_vk_types.h
-include/vk_dispatch_table_helper.h
-include/vk_enum_string_helper.h
-include/vk_extension_helper.h
-include/vk_format_utils.cpp
-include/vk_format_utils.h
-include/vk_layer_config.cpp
-include/vk_layer_config.h
-include/vk_layer_data.h
-include/vk_layer_dispatch_table.h
-include/vk_layer_extension_utils.cpp
-include/vk_layer_extension_utils.h
-include/vk_layer_logging.h
-include/vk_layer_utils.cpp
-include/vk_layer_utils.h
-include/vk_loader_layer.h
-include/vk_loader_platform.h
-include/vk_object_types.h
-include/vk_safe_struct.cpp
-include/vk_safe_struct.h
-include/vk_typemap_helper.h
-include/vk_validation_error_messages.h
-lib/libVkLayer_core_validation.so
-lib/libVkLayer_khronos_validation.so
-lib/libVkLayer_object_lifetimes.so
-lib/libVkLayer_stateless_validation.so
-lib/libVkLayer_thread_safety.so
-lib/libVkLayer_unique_objects.so
-lib/libVkLayer_utils.a
+@so lib/libVkLayer_khronos_validation.so
+@static-lib lib/libVkLayer_utils.a
share/vulkan/
share/vulkan/explicit_layer.d/
-share/vulkan/explicit_layer.d/VkLayer_core_validation.json
share/vulkan/explicit_layer.d/VkLayer_khronos_validation.json
-share/vulkan/explicit_layer.d/VkLayer_object_lifetimes.json
-share/vulkan/explicit_layer.d/VkLayer_standard_validation.json
-share/vulkan/explicit_layer.d/VkLayer_stateless_validation.json
-share/vulkan/explicit_layer.d/VkLayer_thread_safety.json
-share/vulkan/explicit_layer.d/VkLayer_unique_objects.json
