From e2bdbc2151a98a73cb305b266ceca0c785478984 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Thu, 20 Jul 2023 12:47:57 -0500 Subject: [PATCH] nvk: Rename nvk_device::ctx to ws_ctx Part-of: --- src/nouveau/vulkan/nvk_device.c | 6 +++--- src/nouveau/vulkan/nvk_device.h | 2 +- src/nouveau/vulkan/nvk_queue_drm_nouveau.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/nouveau/vulkan/nvk_device.c b/src/nouveau/vulkan/nvk_device.c index a422fc5..f28ebfb 100644 --- a/src/nouveau/vulkan/nvk_device.c +++ b/src/nouveau/vulkan/nvk_device.c @@ -143,7 +143,7 @@ nvk_CreateDevice(VkPhysicalDevice physicalDevice, dev->vk.command_buffer_ops = &nvk_cmd_buffer_ops; dev->pdev = pdev; - int ret = nouveau_ws_context_create(pdev->dev, &dev->ctx); + int ret = nouveau_ws_context_create(pdev->dev, &dev->ws_ctx); if (ret) { if (ret == -ENOSPC) result = vk_error(dev, VK_ERROR_TOO_MANY_OBJECTS); @@ -268,7 +268,7 @@ fail_samplers: fail_images: nvk_descriptor_table_finish(dev, &dev->images); fail_memory_objects: - nouveau_ws_context_destroy(dev->ctx); + nouveau_ws_context_destroy(dev->ws_ctx); fail_init: vk_device_finish(&dev->vk); fail_alloc: @@ -299,7 +299,7 @@ nvk_DestroyDevice(VkDevice _device, const VkAllocationCallbacks *pAllocator) nvk_descriptor_table_finish(dev, &dev->samplers); nvk_descriptor_table_finish(dev, &dev->images); assert(list_is_empty(&dev->memory_objects)); - nouveau_ws_context_destroy(dev->ctx); + nouveau_ws_context_destroy(dev->ws_ctx); vk_free(&dev->vk.alloc, dev); } diff --git a/src/nouveau/vulkan/nvk_device.h b/src/nouveau/vulkan/nvk_device.h index a53a472..e9da49c 100644 --- a/src/nouveau/vulkan/nvk_device.h +++ b/src/nouveau/vulkan/nvk_device.h @@ -29,7 +29,7 @@ struct nvk_device { struct vk_device vk; struct nvk_physical_device *pdev; - struct nouveau_ws_context *ctx; + struct nouveau_ws_context *ws_ctx; /* Protected by nvk_device::mutex */ struct list_head memory_objects; diff --git a/src/nouveau/vulkan/nvk_queue_drm_nouveau.c b/src/nouveau/vulkan/nvk_queue_drm_nouveau.c index fd90bee..078c518 100644 --- a/src/nouveau/vulkan/nvk_queue_drm_nouveau.c +++ b/src/nouveau/vulkan/nvk_queue_drm_nouveau.c @@ -24,7 +24,7 @@ push_builder_init(struct nvk_device *dev, struct push_builder *pb) { pb->dev = dev; pb->req = (struct drm_nouveau_gem_pushbuf) { - .channel = dev->ctx->channel, + .channel = dev->ws_ctx->channel, .nr_buffers = 0, .buffers = (uintptr_t)&pb->req_bo, .nr_push = 0, -- 2.7.4