fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 06:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

dzn: use define instead of constexpr

Browse source 
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15816>
This commit is contained in:
Erik Faye-Lund 2022-04-07 14:51:37 +02:00 • committed by Marge Bot
parent 5a9571ee2c
commit 502c36c07d
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/microsoft/vulkan/dzn_device.cpp
View file

@ -55,6 +55,8 @@
#define DZN_API_VERSION VK_MAKE_VERSION(1, 0, VK_HEADER_VERSION)
#define MAX_TIER2_MEMORY_TYPES 3
static const struct vk_instance_extension_table instance_extensions = {
.KHR_get_physical_device_properties2 = true,
#ifdef DZN_USE_WSI_PLATFORM
@ -389,12 +391,11 @@ dzn_physical_device_init_memory(struct dzn_physical_device *pdev)
mem->memoryTypes[1].propertyFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
}
constexpr unsigned MaxTier2MemoryTypes = 3;
assert(mem->memoryTypeCount <= MaxTier2MemoryTypes);
assert(mem->memoryTypeCount <= MAX_TIER2_MEMORY_TYPES);
if (pdev->options.ResourceHeapTier == D3D12_RESOURCE_HEAP_TIER_1) {
unsigned oldMemoryTypeCount = mem->memoryTypeCount;
VkMemoryType oldMemoryTypes[MaxTier2MemoryTypes];
VkMemoryType oldMemoryTypes[MAX_TIER2_MEMORY_TYPES];
memcpy(oldMemoryTypes, mem->memoryTypes, oldMemoryTypeCount * sizeof(VkMemoryType));