diff options
Diffstat (limited to 'render')
| -rw-r--r-- | render/vulkan/renderer.c | 8 | ||||
| -rw-r--r-- | render/vulkan/texture.c | 2 | ||||
| -rw-r--r-- | render/vulkan/vulkan.c | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/render/vulkan/renderer.c b/render/vulkan/renderer.c index 0b99a6a4..8d93e936 100644 --- a/render/vulkan/renderer.c +++ b/render/vulkan/renderer.c @@ -444,7 +444,7 @@ static bool wait_command_buffer(struct wlr_vk_command_buffer *cb, .pSemaphores = &renderer->timeline_semaphore, .pValues = &cb->timeline_point, }; - res = renderer->dev->api.waitSemaphoresKHR(renderer->dev->dev, &wait_info, UINT64_MAX); + res = renderer->dev->api.vkWaitSemaphoresKHR(renderer->dev->dev, &wait_info, UINT64_MAX); if (res != VK_SUCCESS) { wlr_vk_error("vkWaitSemaphoresKHR", res); return false; @@ -476,7 +476,7 @@ static struct wlr_vk_command_buffer *get_command_buffer( VkResult res; uint64_t current_point; - res = renderer->dev->api.getSemaphoreCounterValueKHR(renderer->dev->dev, + res = renderer->dev->api.vkGetSemaphoreCounterValueKHR(renderer->dev->dev, renderer->timeline_semaphore, ¤t_point); if (res != VK_SUCCESS) { wlr_vk_error("vkGetSemaphoreCounterValueKHR", res); @@ -839,7 +839,7 @@ static bool vulkan_sync_foreign_texture(struct wlr_vk_texture *texture) { .semaphore = texture->foreign_semaphores[i], .fd = sync_file_fd, }; - res = renderer->dev->api.importSemaphoreFdKHR(renderer->dev->dev, &import_info); + res = renderer->dev->api.vkImportSemaphoreFdKHR(renderer->dev->dev, &import_info); if (res != VK_SUCCESS) { close(sync_file_fd); wlr_vk_error("vkImportSemaphoreFdKHR", res); @@ -873,7 +873,7 @@ static bool vulkan_sync_render_buffer(struct wlr_vk_renderer *renderer, .handleType = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT, }; int sync_file_fd = -1; - res = renderer->dev->api.getSemaphoreFdKHR(renderer->dev->dev, + res = renderer->dev->api.vkGetSemaphoreFdKHR(renderer->dev->dev, &get_fence_fd_info, &sync_file_fd); if (res != VK_SUCCESS) { wlr_vk_error("vkGetSemaphoreFdKHR", res); diff --git a/render/vulkan/texture.c b/render/vulkan/texture.c index 705c284c..124b041f 100644 --- a/render/vulkan/texture.c +++ b/render/vulkan/texture.c @@ -542,7 +542,7 @@ VkImage vulkan_import_dmabuf(struct wlr_vk_renderer *renderer, VkMemoryFdPropertiesKHR fdp = { .sType = VK_STRUCTURE_TYPE_MEMORY_FD_PROPERTIES_KHR, }; - res = renderer->dev->api.getMemoryFdPropertiesKHR(dev, htype, + res = renderer->dev->api.vkGetMemoryFdPropertiesKHR(dev, htype, attribs->fd[i], &fdp); if (res != VK_SUCCESS) { wlr_vk_error("getMemoryFdPropertiesKHR", res); diff --git a/render/vulkan/vulkan.c b/render/vulkan/vulkan.c index 418b7c8c..c285ea52 100644 --- a/render/vulkan/vulkan.c +++ b/render/vulkan/vulkan.c @@ -569,12 +569,12 @@ struct wlr_vk_device *vulkan_device_create(struct wlr_vk_instance *ini, vkGetDeviceQueue(dev->dev, dev->queue_family, 0, &dev->queue); load_device_proc(dev, "vkGetMemoryFdPropertiesKHR", - &dev->api.getMemoryFdPropertiesKHR); - load_device_proc(dev, "vkWaitSemaphoresKHR", &dev->api.waitSemaphoresKHR); + &dev->api.vkGetMemoryFdPropertiesKHR); + load_device_proc(dev, "vkWaitSemaphoresKHR", &dev->api.vkWaitSemaphoresKHR); load_device_proc(dev, "vkGetSemaphoreCounterValueKHR", - &dev->api.getSemaphoreCounterValueKHR); - load_device_proc(dev, "vkGetSemaphoreFdKHR", &dev->api.getSemaphoreFdKHR); - load_device_proc(dev, "vkImportSemaphoreFdKHR", &dev->api.importSemaphoreFdKHR); + &dev->api.vkGetSemaphoreCounterValueKHR); + load_device_proc(dev, "vkGetSemaphoreFdKHR", &dev->api.vkGetSemaphoreFdKHR); + load_device_proc(dev, "vkImportSemaphoreFdKHR", &dev->api.vkImportSemaphoreFdKHR); // - check device format support - size_t max_fmts; |