OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvk: Drop nvk_physical_device::instance

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Faith Ekstrand
2023-07-20 12:54:19 -05:00
committed by Marge Bot
parent 221e024386
commit e722d0ff0b
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nouveau/vulkan/nvk_device.c
View File

@@ -123,7 +123,7 @@ nvk_CreateDevice(VkPhysicalDevice physicalDevice,
VkResult result = VK_ERROR_OUT_OF_HOST_MEMORY; VkResult result = VK_ERROR_OUT_OF_HOST_MEMORY;
struct nvk_device *dev; struct nvk_device *dev;
dev = vk_zalloc2(&pdev->instance->vk.alloc, pAllocator, dev = vk_zalloc2(&pdev->vk.instance->alloc, pAllocator,
sizeof(*dev), 8, VK_SYSTEM_ALLOCATION_SCOPE_DEVICE); sizeof(*dev), 8, VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
if (!dev) if (!dev)
return vk_error(pdev, VK_ERROR_OUT_OF_HOST_MEMORY); return vk_error(pdev, VK_ERROR_OUT_OF_HOST_MEMORY);

3
src/nouveau/vulkan/nvk_physical_device.c
View File

@@ -648,7 +648,6 @@ nvk_create_drm_physical_device(struct vk_instance *_instance,
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
goto fail_alloc; goto fail_alloc;
pdev->instance = instance;
pdev->dev = ndev; pdev->dev = ndev;
pdev->info = ndev->info; pdev->info = ndev->info;
@@ -718,7 +717,7 @@ nvk_physical_device_destroy(struct vk_physical_device *vk_pdev)
nvk_finish_wsi(pdev); nvk_finish_wsi(pdev);
nouveau_ws_device_destroy(pdev->dev); nouveau_ws_device_destroy(pdev->dev);
vk_physical_device_finish(&pdev->vk); vk_physical_device_finish(&pdev->vk);
vk_free(&pdev->instance->vk.alloc, pdev); vk_free(&pdev->vk.instance->alloc, pdev);
} }
VKAPI_ATTR void VKAPI_CALL VKAPI_ATTR void VKAPI_CALL

1
src/nouveau/vulkan/nvk_physical_device.h
View File

@@ -14,7 +14,6 @@ struct nvk_instance;
struct nvk_physical_device { struct nvk_physical_device {
struct vk_physical_device vk; struct vk_physical_device vk;
struct nvk_instance *instance;
struct nouveau_ws_device *dev; struct nouveau_ws_device *dev;
struct nv_device_info info; struct nv_device_info info;
struct wsi_device wsi_device; struct wsi_device wsi_device;

6
src/nouveau/vulkan/nvk_wsi.c
View File

@@ -7,7 +7,7 @@ static VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL
nvk_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName) nvk_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName)
{ {
VK_FROM_HANDLE(nvk_physical_device, pdev, physicalDevice); VK_FROM_HANDLE(nvk_physical_device, pdev, physicalDevice);
return vk_instance_get_proc_addr_unchecked(&pdev->instance->vk, pName); return vk_instance_get_proc_addr_unchecked(pdev->vk.instance, pName);
} }
VkResult VkResult
@@ -20,7 +20,7 @@ nvk_init_wsi(struct nvk_physical_device *pdev)
}; };
result = wsi_device_init(&pdev->wsi_device, result = wsi_device_init(&pdev->wsi_device,
nvk_physical_device_to_handle(pdev), nvk_physical_device_to_handle(pdev),
nvk_wsi_proc_addr, &pdev->instance->vk.alloc, nvk_wsi_proc_addr, &pdev->vk.instance->alloc,
-1, NULL, &wsi_options); -1, NULL, &wsi_options);
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
return result; return result;
@@ -36,5 +36,5 @@ void
nvk_finish_wsi(struct nvk_physical_device *pdev) nvk_finish_wsi(struct nvk_physical_device *pdev)
{ {
pdev->vk.wsi_device = NULL; pdev->vk.wsi_device = NULL;
wsi_device_finish(&pdev->wsi_device, &pdev->instance->vk.alloc); wsi_device_finish(&pdev->wsi_device, &pdev->vk.instance->alloc);
} }