From 904d8c3d7e293020b5503915d8dc2199f118afda Mon Sep 17 00:00:00 2001 From: spencer-lunarg Date: Wed, 22 Jan 2025 23:17:13 -0500 Subject: [PATCH] icd: Add VkPhysicalDeviceMaintenance3Properties --- icd/generated/function_declarations.h | 2 +- icd/generated/function_definitions.h | 8 +++++++- scripts/generate_source.py | 10 +++++----- scripts/kvt_genvk.py | 8 +++----- scripts/mock_icd_generator.py | 16 +++++++++++----- 5 files changed, 27 insertions(+), 17 deletions(-) diff --git a/icd/generated/function_declarations.h b/icd/generated/function_declarations.h index 806cdb34e..5fb72f33b 100644 --- a/icd/generated/function_declarations.h +++ b/icd/generated/function_declarations.h @@ -1,5 +1,5 @@ /* -** Copyright (c) 2015-2024 The Khronos Group Inc. +** Copyright (c) 2015-2025 The Khronos Group Inc. ** ** Licensed under the Apache License, Version 2.0 (the "License"); ** you may not use this file except in compliance with the License. diff --git a/icd/generated/function_definitions.h b/icd/generated/function_definitions.h index 0f79f18d7..5b0034ccd 100644 --- a/icd/generated/function_definitions.h +++ b/icd/generated/function_definitions.h @@ -1,5 +1,5 @@ /* -** Copyright (c) 2015-2024 The Khronos Group Inc. +** Copyright (c) 2015-2025 The Khronos Group Inc. ** ** Licensed under the Apache License, Version 2.0 (the "License"); ** you may not use this file except in compliance with the License. @@ -4030,6 +4030,12 @@ static VKAPI_ATTR void VKAPI_CALL GetPhysicalDeviceProperties2KHR( fragment_density_map2_props->maxDescriptorSetSubsampledSamplers = 1; } + auto *maintenance3_props = lvl_find_mod_in_chain(pProperties->pNext); + if (maintenance3_props) { + maintenance3_props->maxMemoryAllocationSize = 1073741824; + maintenance3_props->maxPerSetDescriptors = 1024; + } + const uint32_t num_copy_layouts = 5; const VkImageLayout HostCopyLayouts[]{ VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, diff --git a/scripts/generate_source.py b/scripts/generate_source.py index 70e138db0..8b1e3acf1 100755 --- a/scripts/generate_source.py +++ b/scripts/generate_source.py @@ -1,9 +1,9 @@ #!/usr/bin/env python3 -# Copyright (c) 2019-2023 The Khronos Group Inc. -# Copyright (c) 2019-2023 Valve Corporation -# Copyright (c) 2019-2023 LunarG, Inc. -# Copyright (c) 2019-2023 Google Inc. -# Copyright (c) 2023-2023 RasterGrid Kft. +# Copyright (c) 2019-2025 The Khronos Group Inc. +# Copyright (c) 2019-2025 Valve Corporation +# Copyright (c) 2019-2025 LunarG, Inc. +# Copyright (c) 2019-2025 Google Inc. +# Copyright (c) 2023-2025 RasterGrid Kft. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/scripts/kvt_genvk.py b/scripts/kvt_genvk.py index a31bc08e3..8b9de7b7d 100644 --- a/scripts/kvt_genvk.py +++ b/scripts/kvt_genvk.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 # -# Copyright (c) 2013-2024 The Khronos Group Inc. -# Copyright (c) 2023-2024 RasterGrid Kft. +# Copyright (c) 2013-2025 The Khronos Group Inc. +# Copyright (c) 2023-2025 RasterGrid Kft. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,9 +16,7 @@ # limitations under the License. import argparse -import cProfile import pdb -import string import sys import time import os @@ -104,7 +102,7 @@ def makeGenOpts(args): # Copyright text prefixing all headers (list of strings). prefixStrings = [ '/*', - '** Copyright (c) 2015-2024 The Khronos Group Inc.', + '** Copyright (c) 2015-2025 The Khronos Group Inc.', '**', '** Licensed under the Apache License, Version 2.0 (the "License");', '** you may not use this file except in compliance with the License.', diff --git a/scripts/mock_icd_generator.py b/scripts/mock_icd_generator.py index c788e7164..49176b50b 100644 --- a/scripts/mock_icd_generator.py +++ b/scripts/mock_icd_generator.py @@ -1,10 +1,10 @@ #!/usr/bin/python3 -i # -# Copyright (c) 2015-2023 The Khronos Group Inc. -# Copyright (c) 2015-2023 Valve Corporation -# Copyright (c) 2015-2023 LunarG, Inc. -# Copyright (c) 2015-2023 Google Inc. -# Copyright (c) 2023-2023 RasterGrid Kft. +# Copyright (c) 2015-2025 The Khronos Group Inc. +# Copyright (c) 2015-2025 Valve Corporation +# Copyright (c) 2015-2025 LunarG, Inc. +# Copyright (c) 2015-2025 Google Inc. +# Copyright (c) 2023-2025 RasterGrid Kft. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -677,6 +677,12 @@ fragment_density_map2_props->maxDescriptorSetSubsampledSamplers = 1; } + auto *maintenance3_props = lvl_find_mod_in_chain(pProperties->pNext); + if (maintenance3_props) { + maintenance3_props->maxMemoryAllocationSize = 1073741824; + maintenance3_props->maxPerSetDescriptors = 1024; + } + const uint32_t num_copy_layouts = 5; const VkImageLayout HostCopyLayouts[]{ VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,