From cd7ad7bd7ed43d88314ae6526066663e5c0ed86b Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 4 Sep 2024 07:32:24 -0400 Subject: [PATCH] vk: rename DGC feature to DGC-NV this is an NV extension, so it should have NV suffix Part-of: --- src/amd/vulkan/radv_device.h | 2 +- src/amd/vulkan/radv_physical_device.c | 2 +- src/gallium/frontends/lavapipe/lvp_device.c | 2 +- src/vulkan/util/vk_physical_device_features_gen.py | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/amd/vulkan/radv_device.h b/src/amd/vulkan/radv_device.h index b769ac3c543..e4ba11af341 100644 --- a/src/amd/vulkan/radv_device.h +++ b/src/amd/vulkan/radv_device.h @@ -564,7 +564,7 @@ radv_device_physical(const struct radv_device *dev) static inline bool radv_uses_device_generated_commands(const struct radv_device *device) { - return device->vk.enabled_features.deviceGeneratedCommands || device->vk.enabled_features.deviceGeneratedCompute; + return device->vk.enabled_features.deviceGeneratedCommandsNV || device->vk.enabled_features.deviceGeneratedCompute; } static inline bool diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c index bba172dcdf2..4087ba1f02a 100644 --- a/src/amd/vulkan/radv_physical_device.c +++ b/src/amd/vulkan/radv_physical_device.c @@ -1089,7 +1089,7 @@ radv_physical_device_get_features(const struct radv_physical_device *pdev, struc .performanceCounterMultipleQueryPools = has_perf_query, /* VK_NV_device_generated_commands */ - .deviceGeneratedCommands = true, + .deviceGeneratedCommandsNV = true, /* VK_EXT_attachment_feedback_loop_layout */ .attachmentFeedbackLoopLayout = true, diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index 68887b454b3..361fb3f52da 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -627,7 +627,7 @@ lvp_get_features(const struct lvp_physical_device *pdevice, .nullDescriptor = true, /* VK_NV_device_generated_commands */ - .deviceGeneratedCommands = true, + .deviceGeneratedCommandsNV = true, /* VK_EXT_primitive_topology_list_restart */ .primitiveTopologyListRestart = true, diff --git a/src/vulkan/util/vk_physical_device_features_gen.py b/src/vulkan/util/vk_physical_device_features_gen.py index 47cee1af52a..e6eee6df200 100644 --- a/src/vulkan/util/vk_physical_device_features_gen.py +++ b/src/vulkan/util/vk_physical_device_features_gen.py @@ -48,6 +48,8 @@ RENAMED_FEATURES = { ('CooperativeMatrixFeaturesNV', 'cooperativeMatrix'): 'cooperativeMatrixNV', ('CooperativeMatrixFeaturesNV', 'cooperativeMatrixRobustBufferAccess'): 'cooperativeMatrixRobustBufferAccessNV', + + ('DeviceGeneratedCommandsFeaturesNV', 'deviceGeneratedCommands'): 'deviceGeneratedCommandsNV', } KNOWN_ALIASES = [