fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-12 04:50:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nvk: use winsys lib

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Karol Herbst 2022-05-19 02:48:16 +02:00 • committed by Marge Bot
parent 0749492760
commit a0d521d268
3 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/nouveau/vulkan/meson.build
View file

@ -38,6 +38,7 @@ nvk_entrypoints = custom_target(
nvk_deps = [
dep_libdrm,
idep_nouveau_ws,
idep_vulkan_runtime,
idep_vulkan_util,
idep_vulkan_wsi,

20
src/nouveau/vulkan/nvk_physical_device.c
View file

@ -59,11 +59,15 @@ VKAPI_ATTR void VKAPI_CALL
nvk_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
VkPhysicalDeviceProperties2 *pProperties)
{
// VK_FROM_HANDLE(nvk_physical_device, pdevice, physicalDevice);
VK_FROM_HANDLE(nvk_physical_device, pdevice, physicalDevice);
pProperties->properties = (VkPhysicalDeviceProperties) {
.apiVersion = VK_MAKE_VERSION(1, 0, VK_HEADER_VERSION),
.driverVersion = vk_get_driver_version(),
.vendorID = pdevice->dev->vendor_id,
.deviceID = pdevice->dev->device_id,
.deviceType = pdevice->dev->is_integrated ? VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU
: VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU,
/* More properties */
};
@ -135,6 +139,12 @@ nvk_physical_device_try_create(struct nvk_instance *instance,
instance, VK_ERROR_INCOMPATIBLE_DRIVER, "Unable to open device %s: %m", path);
}
struct nouveau_ws_device *ndev = nouveau_ws_device_new(fd);
if (!ndev) {
result = vk_error(instance, VK_ERROR_INCOMPATIBLE_DRIVER);
goto fail_fd;
}
vk_warn_non_conformant_implementation("nvk");
struct nvk_physical_device *device =
@ -142,7 +152,7 @@ nvk_physical_device_try_create(struct nvk_instance *instance,
if (device == NULL) {
result = vk_error(instance, VK_ERROR_OUT_OF_HOST_MEMORY);
goto fail_fd;
goto fail_dev_alloc;
}
struct vk_physical_device_dispatch_table dispatch_table;
@ -164,6 +174,7 @@ nvk_physical_device_try_create(struct nvk_instance *instance,
}
device->instance = instance;
device->dev = ndev;
*device_out = device;
@ -172,6 +183,10 @@ nvk_physical_device_try_create(struct nvk_instance *instance,
fail_alloc:
vk_free(&instance->vk.alloc, device);
fail_dev_alloc:
nouveau_ws_device_destroy(ndev);
return result;
fail_fd:
close(fd);
return result;
@ -180,6 +195,7 @@ fail_fd:
void
nvk_physical_device_destroy(struct nvk_physical_device *device)
{
nouveau_ws_device_destroy(device->dev);
vk_free(&device->instance->vk.alloc, device);
}

3
src/nouveau/vulkan/nvk_physical_device.h
View file

@ -3,6 +3,8 @@
#include "nvk_private.h"
#include "nouveau_device.h"
#include "vulkan/runtime/vk_physical_device.h"
struct nvk_instance;
@ -10,6 +12,7 @@ struct nvk_instance;
struct nvk_physical_device {
struct vk_physical_device vk;
struct nvk_instance *instance;
struct nouveau_ws_device *dev;
/* Link in nvk_instance::physical_devices */
struct list_head link;