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

graphics/vulkan-tools: switch to upstream -Werror fix

Browse Source
This commit is contained in:
Jan Beich 2021-06-15 21:46:17 +00:00
parent 45e72f3706
commit 99a7b10b6f
3 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
graphics/vulkan-tools/Makefile
View File

@ -3,6 +3,9 @@ DISTVERSIONPREFIX= v
DISTVERSION= 1.2.181
CATEGORIES= graphics
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+= 02897e9cb615.patch:-p1 # https://github.com/KhronosGroup/Vulkan-Tools/pull/536
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Tools and demos for the Vulkan graphics API

2
graphics/vulkan-tools/distinfo
View File

@ -1,3 +1,5 @@
TIMESTAMP = 1623697343
SHA256 (KhronosGroup-Vulkan-Tools-v1.2.181_GH0.tar.gz) = 903e03264d6dedc8c9d73d5044f0886e60de79b6849a062c3bd9a69a7667d069
SIZE (KhronosGroup-Vulkan-Tools-v1.2.181_GH0.tar.gz) = 846689
SHA256 (02897e9cb615.patch) = 040384f564b8d174a17a9236bdfd80deac8ec848c37cea9049cbeb2f25574215
SIZE (02897e9cb615.patch) = 1120

30
graphics/vulkan-tools/files/patch-werror
View File

@ -1,36 +1,6 @@
Silence Clang warnings that GCC ignores
https://github.com/KhronosGroup/Vulkan-Tools/issues/531
https://github.com/KhronosGroup/Vulkan-Tools/issues/532
--- cube/cube.c.orig 2021-06-14 19:02:23 UTC
+++ cube/cube.c
@@ -3027,12 +3027,12 @@ static VkResult demo_create_display_surface(struct dem
VkDisplayPlaneCapabilitiesKHR planeCaps;
vkGetDisplayPlaneCapabilitiesKHR(demo->gpu, mode_props.displayMode, plane_index, &planeCaps);
// Find a supported alpha mode
- VkCompositeAlphaFlagBitsKHR alphaMode = VK_DISPLAY_PLANE_ALPHA_OPAQUE_BIT_KHR;
+ VkCompositeAlphaFlagBitsKHR alphaMode = (VkCompositeAlphaFlagBitsKHR)VK_DISPLAY_PLANE_ALPHA_OPAQUE_BIT_KHR;
VkCompositeAlphaFlagBitsKHR alphaModes[4] = {
- VK_DISPLAY_PLANE_ALPHA_OPAQUE_BIT_KHR,
- VK_DISPLAY_PLANE_ALPHA_GLOBAL_BIT_KHR,
- VK_DISPLAY_PLANE_ALPHA_PER_PIXEL_BIT_KHR,
- VK_DISPLAY_PLANE_ALPHA_PER_PIXEL_PREMULTIPLIED_BIT_KHR,
+ (VkCompositeAlphaFlagBitsKHR)VK_DISPLAY_PLANE_ALPHA_OPAQUE_BIT_KHR,
+ (VkCompositeAlphaFlagBitsKHR)VK_DISPLAY_PLANE_ALPHA_GLOBAL_BIT_KHR,
+ (VkCompositeAlphaFlagBitsKHR)VK_DISPLAY_PLANE_ALPHA_PER_PIXEL_BIT_KHR,
+ (VkCompositeAlphaFlagBitsKHR)VK_DISPLAY_PLANE_ALPHA_PER_PIXEL_PREMULTIPLIED_BIT_KHR,
};
for (uint32_t i = 0; i < sizeof(alphaModes); i++) {
if (planeCaps.supportedAlpha & alphaModes[i]) {
@@ -3050,7 +3050,7 @@ static VkResult demo_create_display_surface(struct dem
create_info.planeIndex = plane_index;
create_info.planeStackIndex = plane_props[plane_index].currentStackIndex;
create_info.transform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
- create_info.alphaMode = alphaMode;
+ create_info.alphaMode = (VkDisplayPlaneAlphaFlagBitsKHR)alphaMode;
create_info.globalAlpha = 1.0f;
create_info.imageExtent = image_extent;
--- cube/cube.cpp.orig 2021-06-14 19:02:23 UTC
+++ cube/cube.cpp
@@ -405,16 +405,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM