diff options
| author | Ethan Morgan <ethan@gweithio.com> | 2026-02-14 16:44:06 +0000 |
|---|---|---|
| committer | Ethan Morgan <ethan@gweithio.com> | 2026-02-14 16:44:06 +0000 |
| commit | 54409423f767d8b1cf30cb7d0efca6b4ca138823 (patch) | |
| tree | d915ac7828703ce4b963efdd9728a1777ba18c1e /vcpkg/ports/magnum/006-fix-build.patch | |
Diffstat (limited to 'vcpkg/ports/magnum/006-fix-build.patch')
| -rw-r--r-- | vcpkg/ports/magnum/006-fix-build.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/vcpkg/ports/magnum/006-fix-build.patch b/vcpkg/ports/magnum/006-fix-build.patch new file mode 100644 index 0000000..002b013 --- /dev/null +++ b/vcpkg/ports/magnum/006-fix-build.patch @@ -0,0 +1,70 @@ +diff --git a/src/Magnum/Vk/Enums.cpp b/src/Magnum/Vk/Enums.cpp +index ad8b6d063..b7dffb74f 100644 +--- a/src/Magnum/Vk/Enums.cpp ++++ b/src/Magnum/Vk/Enums.cpp +@@ -36,17 +36,17 @@ namespace Magnum { namespace Vk { + + namespace { + +-constexpr VkPrimitiveTopology PrimitiveTopologyMapping[]{ ++constexpr UnsignedInt PrimitiveTopologyMapping[]{ + VK_PRIMITIVE_TOPOLOGY_POINT_LIST, + VK_PRIMITIVE_TOPOLOGY_LINE_LIST, +- VkPrimitiveTopology(~UnsignedInt{}), ++ ~UnsignedInt{}, + VK_PRIMITIVE_TOPOLOGY_LINE_STRIP, + VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, + VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP, + VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN, +- VkPrimitiveTopology(~UnsignedInt{}), /* Instances */ +- VkPrimitiveTopology(~UnsignedInt{}), /* Faces */ +- VkPrimitiveTopology(~UnsignedInt{}) /* Edges */ ++ ~UnsignedInt{}, /* Instances */ ++ ~UnsignedInt{}, /* Faces */ ++ ~UnsignedInt{} /* Edges */ + }; + + constexpr VkIndexType IndexTypeMapping[]{ +@@ -94,12 +94,12 @@ constexpr VkSamplerMipmapMode SamplerMipmapModeMapping[]{ + VK_SAMPLER_MIPMAP_MODE_LINEAR + }; + +-constexpr VkSamplerAddressMode SamplerAddressModeMapping[]{ ++constexpr UnsignedInt SamplerAddressModeMapping[]{ + VK_SAMPLER_ADDRESS_MODE_REPEAT, + VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT, + VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, + VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER, +- VkSamplerAddressMode(~UnsignedInt{}), ++ ~UnsignedInt{}, + }; + + } +@@ -119,10 +119,10 @@ VkPrimitiveTopology vkPrimitiveTopology(const Magnum::MeshPrimitive primitive) { + + CORRADE_ASSERT(UnsignedInt(primitive) - 1 < Containers::arraySize(PrimitiveTopologyMapping), + "Vk::vkPrimitiveTopology(): invalid primitive" << primitive, {}); +- const VkPrimitiveTopology out = PrimitiveTopologyMapping[UnsignedInt(primitive) - 1]; +- CORRADE_ASSERT(out != VkPrimitiveTopology(~UnsignedInt{}), ++ const UnsignedInt out = PrimitiveTopologyMapping[UnsignedInt(primitive) - 1]; ++ CORRADE_ASSERT(out != ~UnsignedInt{}, + "Vk::vkPrimitiveTopology(): unsupported primitive" << primitive, {}); +- return out; ++ return VkPrimitiveTopology(out); + } + + bool hasVkIndexType(const Magnum::MeshIndexType type) { +@@ -224,10 +224,10 @@ bool hasVkSamplerAddressMode(const Magnum::SamplerWrapping wrapping) { + VkSamplerAddressMode vkSamplerAddressMode(const Magnum::SamplerWrapping wrapping) { + CORRADE_ASSERT(UnsignedInt(wrapping) < Containers::arraySize(SamplerAddressModeMapping), + "Vk::vkSamplerAddressMode(): invalid wrapping" << wrapping, {}); +- const VkSamplerAddressMode out = SamplerAddressModeMapping[UnsignedInt(wrapping)]; +- CORRADE_ASSERT(out != VkSamplerAddressMode(~UnsignedInt{}), ++ const UnsignedInt out = SamplerAddressModeMapping[UnsignedInt(wrapping)]; ++ CORRADE_ASSERT(out != ~UnsignedInt{}, + "Vk::vkSamplerAddressMode(): unsupported wrapping" << wrapping, {}); +- return out; ++ return VkSamplerAddressMode(out); + } + + }} |