X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Famd%2Fvulkan%2Fradv_private.h;h=6b54a8ad60011d04923494e156b45fe40dcf07bd;hb=f3e37f5d262606f1a0f5a3073835ac0ecc41f629;hp=a54f0147fbcd9a42984198f897baf0da92b700ce;hpb=e4e1a0ac1321730bbdeb4aef89ff14281a0b56eb;p=mesa.git

diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index a54f0147fbc..6b54a8ad600 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -284,6 +284,9 @@ void *radv_lookup_entrypoint(const char *name);
 struct radv_physical_device {
 	VK_LOADER_DATA                              _loader_data;
 
+	/* Link in radv_instance::physical_devices */
+	struct list_head                            link;
+
 	struct radv_instance *                       instance;
 
 	struct radeon_winsys *ws;
@@ -342,8 +345,6 @@ struct radv_instance {
 	VkAllocationCallbacks                       alloc;
 
 	uint32_t                                    apiVersion;
-	int                                         physicalDeviceCount;
-	struct radv_physical_device                 physicalDevices[RADV_MAX_DRM_DEVICES];
 
 	char *                                      engineName;
 	uint32_t                                    engineVersion;
@@ -359,6 +360,9 @@ struct radv_instance {
 	struct radv_physical_device_dispatch_table   physical_device_dispatch;
 	struct radv_device_dispatch_table            device_dispatch;
 
+	bool                                        physical_devices_enumerated;
+	struct list_head                            physical_devices;
+
 	struct driOptionCache dri_options;
 	struct driOptionCache available_dri_options;
 };
@@ -1356,7 +1360,7 @@ struct radv_cmd_buffer {
 	VkShaderStageFlags push_constant_stages;
 	struct radv_descriptor_set meta_push_descriptors;
 
-	struct radv_descriptor_state descriptors[VK_PIPELINE_BIND_POINT_RANGE_SIZE];
+	struct radv_descriptor_state descriptors[MAX_BIND_POINTS];
 
 	struct radv_cmd_buffer_upload upload;