mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

render/vulkan: use full names for extension command fields

Browse source 
This makes grepping much easier.
This commit is contained in:
Simon Ser 2023-04-14 15:53:20 +02:00 • committed by Simon Zeni
parent 25d9055281
commit 92b726ef67
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/render/vulkan.h
View file

@ -45,11 +45,11 @@ struct wlr_vk_device {
VkQueue queue; VkQueue queue;
struct { struct {
PFN_vkGetMemoryFdPropertiesKHR getMemoryFdPropertiesKHR; PFN_vkGetMemoryFdPropertiesKHR vkGetMemoryFdPropertiesKHR;
PFN_vkWaitSemaphoresKHR waitSemaphoresKHR; PFN_vkWaitSemaphoresKHR vkWaitSemaphoresKHR;
PFN_vkGetSemaphoreCounterValueKHR getSemaphoreCounterValueKHR; PFN_vkGetSemaphoreCounterValueKHR vkGetSemaphoreCounterValueKHR;
PFN_vkGetSemaphoreFdKHR getSemaphoreFdKHR; PFN_vkGetSemaphoreFdKHR vkGetSemaphoreFdKHR;
PFN_vkImportSemaphoreFdKHR importSemaphoreFdKHR; PFN_vkImportSemaphoreFdKHR vkImportSemaphoreFdKHR;
} api; } api;
uint32_t format_prop_count; uint32_t format_prop_count;

8
render/vulkan/renderer.c
View file

@ -444,7 +444,7 @@ static bool wait_command_buffer(struct wlr_vk_command_buffer *cb,
.pSemaphores = &renderer->timeline_semaphore, .pSemaphores = &renderer->timeline_semaphore,
.pValues = &cb->timeline_point, .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) { if (res != VK_SUCCESS) {
wlr_vk_error("vkWaitSemaphoresKHR", res); wlr_vk_error("vkWaitSemaphoresKHR", res);
return false; return false;
@ -476,7 +476,7 @@ static struct wlr_vk_command_buffer *get_command_buffer(
VkResult res; VkResult res;
uint64_t current_point; uint64_t current_point;
res = renderer->dev->api.getSemaphoreCounterValueKHR(renderer->dev->dev, res = renderer->dev->api.vkGetSemaphoreCounterValueKHR(renderer->dev->dev,
renderer->timeline_semaphore, &current_point); renderer->timeline_semaphore, &current_point);
if (res != VK_SUCCESS) { if (res != VK_SUCCESS) {
wlr_vk_error("vkGetSemaphoreCounterValueKHR", res); 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], .semaphore = texture->foreign_semaphores[i],
.fd = sync_file_fd, .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) { if (res != VK_SUCCESS) {
close(sync_file_fd); close(sync_file_fd);
wlr_vk_error("vkImportSemaphoreFdKHR", res); 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, .handleType = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT,
}; };
int sync_file_fd = -1; 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); &get_fence_fd_info, &sync_file_fd);
if (res != VK_SUCCESS) { if (res != VK_SUCCESS) {
wlr_vk_error("vkGetSemaphoreFdKHR", res); wlr_vk_error("vkGetSemaphoreFdKHR", res);

2
render/vulkan/texture.c
View file

@ -542,7 +542,7 @@ VkImage vulkan_import_dmabuf(struct wlr_vk_renderer *renderer,
VkMemoryFdPropertiesKHR fdp = { VkMemoryFdPropertiesKHR fdp = {
.sType = VK_STRUCTURE_TYPE_MEMORY_FD_PROPERTIES_KHR, .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); attribs->fd[i], &fdp);
if (res != VK_SUCCESS) { if (res != VK_SUCCESS) {
wlr_vk_error("getMemoryFdPropertiesKHR", res); wlr_vk_error("getMemoryFdPropertiesKHR", res);

10
render/vulkan/vulkan.c
View file

@ -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); vkGetDeviceQueue(dev->dev, dev->queue_family, 0, &dev->queue);
load_device_proc(dev, "vkGetMemoryFdPropertiesKHR", load_device_proc(dev, "vkGetMemoryFdPropertiesKHR",
&dev->api.getMemoryFdPropertiesKHR); &dev->api.vkGetMemoryFdPropertiesKHR);
load_device_proc(dev, "vkWaitSemaphoresKHR", &dev->api.waitSemaphoresKHR); load_device_proc(dev, "vkWaitSemaphoresKHR", &dev->api.vkWaitSemaphoresKHR);
load_device_proc(dev, "vkGetSemaphoreCounterValueKHR", load_device_proc(dev, "vkGetSemaphoreCounterValueKHR",
&dev->api.getSemaphoreCounterValueKHR); &dev->api.vkGetSemaphoreCounterValueKHR);
load_device_proc(dev, "vkGetSemaphoreFdKHR", &dev->api.getSemaphoreFdKHR); load_device_proc(dev, "vkGetSemaphoreFdKHR", &dev->api.vkGetSemaphoreFdKHR);
load_device_proc(dev, "vkImportSemaphoreFdKHR", &dev->api.importSemaphoreFdKHR); load_device_proc(dev, "vkImportSemaphoreFdKHR", &dev->api.vkImportSemaphoreFdKHR);
// - check device format support - // - check device format support -
size_t max_fmts; size_t max_fmts;