Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

vulkan-validation-layers: Update to 1.2.133

Browse Source
This commit is contained in:
Alexey Pavlov
2020-02-28 13:59:20 +03:00
parent 4e470bfd7f
commit 6febb352eb
3 changed files with 28 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

253
mingw-w64-vulkan-validation-layers/002-proper-def-files-for-32bit.patch
View File

@@ -1,244 +1,33 @@
diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/CMakeLists.txt Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/CMakeLists.txt
--- Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/CMakeLists.txt 2017-04-05 00:36:39.000000000 +0300
+++ Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/CMakeLists.txt 2017-06-29 08:34:52.393725000 +0300
@@ -124,6 +124,17 @@
if(CMAKE_COMPILER_IS_GNUCC AND NOT (CMAKE_CXX_COMPILER_VERSION LESS 7.1))
add_compile_options(-Wimplicit-fallthrough=0)
endif()
+
+if (WIN32)
+ if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
+ set(DEFFILE_SUFFIX "")
+ set(WINBITS Win64)
+ else()
+ set(DEFFILE_SUFFIX "-x86")
+ set(WINBITS Win32)
+ endif()
+endif()
+
elseif(MSVC)
# Treat warnings as errors
add_compile_options("/WX")
--- Vulkan-ValidationLayers/layers/CMakeLists.txt.orig 2018-11-18 00:38:59.130491200 +0300
+++ Vulkan-ValidationLayers/layers/CMakeLists.txt 2018-11-18 00:40:07.358393600 +0300
@@ -114,13 +114,13 @@
@@ -114,13 +114,17 @@
# System-specific macros to create a library target.
if(WIN32)
macro(AddVkLayer target LAYER_COMPILE_DEFINITIONS)
- file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/VkLayer_${target}.def DEF_FILE)
+ file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/VkLayer_${target}${DEFFILE_SUFFIX}.def DEF_FILE)
+ if(MSVC)
file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/VkLayer_${target}.def DEF_FILE)
add_custom_target(copy-${target}-def-file ALL
- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DEF_FILE} VkLayer_${target}.def
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DEF_FILE} VkLayer_${target}${DEFFILE_SUFFIX}.def
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DEF_FILE} VkLayer_${target}.def
VERBATIM)
set_target_properties(copy-${target}-def-file PROPERTIES FOLDER ${LAYERS_HELPER_FOLDER})
- add_library(VkLayer_${target} SHARED ${ARGN} VkLayer_${target}.def)
+ add_library(VkLayer_${target} SHARED ${ARGN} VkLayer_${target}${DEFFILE_SUFFIX}.def)
add_library(VkLayer_${target} SHARED ${ARGN} VkLayer_${target}.def)
+ else()
+ add_library(VkLayer_${target} SHARED ${ARGN})
+ endif()
target_compile_definitions(VkLayer_${target} PUBLIC ${LAYER_COMPILE_DEFINITIONS})
target_link_libraries(VkLayer_${target} PRIVATE VkLayer_utils)
add_dependencies(VkLayer_${target} VulkanVL_generate_helper_files VulkanVL_generate_chassis_files VkLayer_utils)
diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/layers/VkLayer_core_validation-x86.def Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/layers/VkLayer_core_validation-x86.def
--- Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/layers/VkLayer_core_validation-x86.def 1970-01-01 03:00:00.000000000 +0300
+++ Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/layers/VkLayer_core_validation-x86.def 2017-04-05 00:36:39.000000000 +0300
@@ -0,0 +1,30 @@
+
+;;;; Begin Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; Copyright (c) 2015-2016 The Khronos Group Inc.
+; Copyright (c) 2015-2016 Valve Corporation
+; Copyright (c) 2015-2016 LunarG, Inc.
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+; Author: Courtney Goeltzenleuchter <courtney@LunarG.com>
+;
+;;;; End Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+LIBRARY VkLayer_core_validation
+EXPORTS
+vkGetInstanceProcAddr@8
+vkGetDeviceProcAddr@8
+vkEnumerateInstanceLayerProperties@8
+vkEnumerateInstanceExtensionProperties@12
+vkNegotiateLoaderLayerInterfaceVersion@4
diff -Naur Vulkan-ValidationLayers-1.1.107-orig/layers/VkLayer_khronos_validation-x86.def Vulkan-ValidationLayers-1.1.107/VkLayer_khronos_validation-x86.def
--- Vulkan-ValidationLayers-1.1.107-orig/layers/VkLayer_khronos_validation-x86.def 2019-06-03 09:36:53.000000000 +0300
+++ Vulkan-ValidationLayers-1.1.107/layers/VkLayer_khronos_validation-x86.def 2019-06-03 09:35:54.131146300 +0300
@@ -0,0 +1,30 @@
+
+;;;; Begin Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; Copyright (c) 2015-2019 The Khronos Group Inc.
+; Copyright (c) 2015-2019 Valve Corporation
+; Copyright (c) 2015-2019 LunarG, Inc.
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+; Author: Mark Lobodzinski <mark@LunarG.com>
+;
+;;;; End Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+LIBRARY VkLayer_khronos_validation
+EXPORTS
+vkGetInstanceProcAddr@8
+vkGetDeviceProcAddr@8
+vkEnumerateInstanceLayerProperties@8
+vkEnumerateInstanceExtensionProperties@12
+vkNegotiateLoaderLayerInterfaceVersion@4
diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/layers/VkLayer_object_lifetimes-x86.def Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/layers/VkLayer_object_lifetimes-x86.def
--- Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/layers/VkLayer_object_lifetimes-x86.def 1970-01-01 03:00:00.000000000 +0300
+++ Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/layers/VkLayer_object_lifetimes-x86.def 2017-04-05 00:36:39.000000000 +0300
@@ -0,0 +1,30 @@
+
+;;;; Begin Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; Copyright (c) 2015-2016 The Khronos Group Inc.
+; Copyright (c) 2015-2016 Valve Corporation
+; Copyright (c) 2015-2016 LunarG, Inc.
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+; Author: Courtney Goeltzenleuchter <courtney@LunarG.com>
+;
+;;;; End Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+LIBRARY VkLayer_object_lifetimes
+EXPORTS
+vkGetInstanceProcAddr@8
+vkGetDeviceProcAddr@8
+vkEnumerateInstanceLayerProperties@8
+vkEnumerateInstanceExtensionProperties@12
+vkNegotiateLoaderLayerInterfaceVersion@4
diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/layers/VkLayer_stateless_validation-x86.def Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/layers/VkLayer_stateless_validation-x86.def
--- Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/layers/VkLayer_stateless_validation-x86.def 1970-01-01 03:00:00.000000000 +0300
+++ Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/layers/VkLayer_stateless_validation-x86.def 2017-04-05 00:36:39.000000000 +0300
@@ -0,0 +1,30 @@
+
+;;;; Begin Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; Copyright (c) 2015-2016 The Khronos Group Inc.
+; Copyright (c) 2015-2016 Valve Corporation
+; Copyright (c) 2015-2016 LunarG, Inc.
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+; Author: Courtney Goeltzenleuchter <courtney@LunarG.com>
+;
+;;;; End Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+LIBRARY VkLayer_stateless_validation
+EXPORTS
+vkGetInstanceProcAddr@8
+vkGetDeviceProcAddr@8
+vkEnumerateInstanceLayerProperties@8
+vkEnumerateInstanceExtensionProperties@12
+vkNegotiateLoaderLayerInterfaceVersion@4
diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/layers/VkLayer_thread_safety-x86.def Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/layers/VkLayer_thread_safety-x86.def
--- Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/layers/VkLayer_thread_safety-x86.def 1970-01-01 03:00:00.000000000 +0300
+++ Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/layers/VkLayer_thread_safety-x86.def 2017-04-05 00:36:39.000000000 +0300
@@ -0,0 +1,30 @@
+
+;;;; Begin Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; Copyright (c) 2015-2016 The Khronos Group Inc.
+; Copyright (c) 2015-2016 Valve Corporation
+; Copyright (c) 2015-2016 LunarG, Inc.
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+; Author: Courtney Goeltzenleuchter <courtney@LunarG.com>
+;
+;;;; End Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+LIBRARY VkLayer_thread_safety
+EXPORTS
+vkGetInstanceProcAddr@8
+vkGetDeviceProcAddr@8
+vkEnumerateInstanceLayerProperties@8
+vkEnumerateInstanceExtensionProperties@12
+vkNegotiateLoaderLayerInterfaceVersion@4
diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/layers/VkLayer_unique_objects-x86.def Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/layers/VkLayer_unique_objects-x86.def
--- Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/layers/VkLayer_unique_objects-x86.def 1970-01-01 03:00:00.000000000 +0300
+++ Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/layers/VkLayer_unique_objects-x86.def 2017-04-05 00:36:39.000000000 +0300
@@ -0,0 +1,30 @@
+
+;;;; Begin Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; Copyright (c) 2015-2016 The Khronos Group Inc.
+; Copyright (c) 2015-2016 Valve Corporation
+; Copyright (c) 2015-2016 LunarG, Inc.
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+; Author: Courtney Goeltzenleuchter <courtney@LunarG.com>
+;
+;;;; End Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+LIBRARY VkLayer_unique_objects
+EXPORTS
+vkGetInstanceProcAddr@8
+vkGetDeviceProcAddr@8
+vkEnumerateInstanceLayerProperties@8
+vkEnumerateInstanceExtensionProperties@12
+vkNegotiateLoaderLayerInterfaceVersion@4
--- Vulkan-ValidationLayers/layers/vk_format_utils.h.orig 2020-02-28 11:50:38.167672800 +0300
+++ Vulkan-ValidationLayers/layers/vk_format_utils.h 2020-02-28 11:51:10.078172600 +0300
@@ -25,7 +25,9 @@
#include "vulkan/vulkan.h"
#if !defined(VK_LAYER_EXPORT)
-#if defined(__GNUC__) && __GNUC__ >= 4
+#if defined(_WIN32)
+#define VK_LAYER_EXPORT __declspec(dllexport)
+#elif defined(__GNUC__) && __GNUC__ >= 4
#define VK_LAYER_EXPORT __attribute__((visibility("default")))
#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
#define VK_LAYER_EXPORT __attribute__((visibility("default")))

4
mingw-w64-vulkan-validation-layers/003-install-layout.patch
View File

@@ -1,9 +1,9 @@
--- Vulkan-ValidationLayers-1.1.112/layers/CMakeLists.txt.orig 2019-07-01 14:07:17.696528300 +0300
+++ Vulkan-ValidationLayers-1.1.112/layers/CMakeLists.txt 2019-07-01 14:08:31.376925800 +0300
@@ -128,7 +128,10 @@
@@ -114,7 +114,10 @@
target_compile_definitions(VkLayer_${target} PUBLIC ${LAYER_COMPILE_DEFINITIONS})
target_link_libraries(VkLayer_${target} PRIVATE VkLayer_utils)
add_dependencies(VkLayer_${target} VulkanVL_generate_helper_files VulkanVL_generate_chassis_files VkLayer_utils)
add_dependencies(VkLayer_${target} VkLayer_utils)
- install(TARGETS VkLayer_${target} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(TARGETS VkLayer_${target}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

10
mingw-w64-vulkan-validation-layers/PKGBUILD
View File

@@ -4,7 +4,7 @@
_realname=Vulkan-ValidationLayers
pkgbase=mingw-w64-vulkan-validation-layers
pkgname=("${MINGW_PACKAGE_PREFIX}-vulkan-validation-layers")
pkgver=1.1.112
pkgver=1.2.133
pkgrel=1
pkgdesc='Vulkan Validation Layers (mingw-w64)'
arch=('any')
@@ -15,16 +15,16 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
"${MINGW_PACKAGE_PREFIX}-vulkan-loader")
makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-glslang"
"${MINGW_PACKAGE_PREFIX}-python3"
"${MINGW_PACKAGE_PREFIX}-python"
"${MINGW_PACKAGE_PREFIX}-spirv-tools")
source=(${_realname}-${pkgver}.tar.gz::"https://github.com/KhronosGroup/${_realname}/archive/v${pkgver}.tar.gz"
001-build-fix.patch
002-proper-def-files-for-32bit.patch
003-install-layout.patch)
sha256sums=('6ba1a0d8082975b4ac39ae01be5e1d5e722247a14a8ac20ce0e9d21a09bfc268'
sha256sums=('f9a87f424960457d6798baa3c592b09a14e2f29533851dddb3fa8a110cf0ae8a'
'1ad7c68024636709c43a7f039f382c0c0d1b87f97a7b13db067c233c31f8ea5f'
'9295dfe1870d65caba0943fac7787aa693b690c66f9b5eefba8a45ae4cdffd02'
'2fb39fdbc02e2adf94d2ef5ed4117b1cc9391a6bfde5a8a259eaeb883beb2ba2')
'6fb0f9e4b2fb2903a50d0b4bbce06e8e8f5ed1045b8d7c875067e0fb2aa6ebb9'
'c158197f8bcb39e540e4156597f3ca6c4b97a007070f882dec5dec68bd72814d')
prepare() {
cd ${srcdir}/${_realname}-${pkgver}