From 24af64baa531f9ac490bc5de433b2b2b52a3ccee Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Fri, 8 Feb 2019 13:45:53 -0800 Subject: [PATCH] turnip: preliminary support for Wayland WSI --- src/freedreno/vulkan/.clang-format | 2 +- src/freedreno/vulkan/meson.build | 10 + src/freedreno/vulkan/tu_device.c | 8 + src/freedreno/vulkan/tu_private.h | 8 + src/freedreno/vulkan/tu_wsi.c | 272 ++++++++++++++++++++++++++ src/freedreno/vulkan/tu_wsi_wayland.c | 59 ++++++ 6 files changed, 358 insertions(+), 1 deletion(-) create mode 100644 src/freedreno/vulkan/tu_wsi.c create mode 100644 src/freedreno/vulkan/tu_wsi_wayland.c diff --git a/src/freedreno/vulkan/.clang-format b/src/freedreno/vulkan/.clang-format index c6bf5df8e6e..b14b5dca727 100644 --- a/src/freedreno/vulkan/.clang-format +++ b/src/freedreno/vulkan/.clang-format @@ -18,7 +18,7 @@ IncludeCategories: Priority: 0 - Regex: '^"(drm/|ir3/|tu_)' Priority: 4 - - Regex: '^"(c11/|compiler/|main/|nir/|spirv/|util/|vk_)' + - Regex: '^"(c11/|compiler/|main/|nir/|spirv/|util/|vk_|wsi_)' Priority: 3 - Regex: '^<(vulkan/)' Priority: 2 diff --git a/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build index 6c0f7d91853..40a0105e9ae 100644 --- a/src/freedreno/vulkan/meson.build +++ b/src/freedreno/vulkan/meson.build @@ -71,12 +71,19 @@ libtu_files = files( 'tu_shader.c', 'tu_util.c', 'tu_util.h', + 'tu_wsi.c', 'vk_format.h', ) tu_deps = [] tu_flags = [] +if with_platform_wayland + tu_deps += dep_wayland_client + tu_flags += '-DVK_USE_PLATFORM_WAYLAND_KHR' + libtu_files += files('tu_wsi_wayland.c') +endif + libvulkan_freedreno = shared_library( 'vulkan_freedreno', [libtu_files, tu_entrypoints, tu_extensions_c, vk_format_table_c], @@ -84,10 +91,12 @@ libvulkan_freedreno = shared_library( inc_common, inc_compiler, inc_vulkan_util, + inc_vulkan_wsi, inc_freedreno, ], link_with : [ libvulkan_util, + libvulkan_wsi, libmesa_util, libfreedreno_drm, # required by ir3_shader_get_variant, which we don't use libfreedreno_ir3, @@ -101,6 +110,7 @@ libvulkan_freedreno = shared_library( dep_thread, dep_valgrind, idep_nir, + tu_deps, ], c_args : [c_vis_args, no_override_init_args, tu_flags], link_args : [ld_args_bsymbolic, ld_args_gc_sections], diff --git a/src/freedreno/vulkan/tu_device.c b/src/freedreno/vulkan/tu_device.c index 3abaf0ff729..c7f4d0b26eb 100644 --- a/src/freedreno/vulkan/tu_device.c +++ b/src/freedreno/vulkan/tu_device.c @@ -293,6 +293,12 @@ tu_physical_device_init(struct tu_physical_device *device, goto fail; } + result = tu_wsi_init(device); + if (result != VK_SUCCESS) { + vk_error(instance, result); + goto fail; + } + return VK_SUCCESS; fail: @@ -305,6 +311,8 @@ fail: static void tu_physical_device_finish(struct tu_physical_device *device) { + tu_wsi_finish(device); + disk_cache_destroy(device->disk_cache); close(device->local_fd); if (device->master_fd != -1) diff --git a/src/freedreno/vulkan/tu_private.h b/src/freedreno/vulkan/tu_private.h index c96353a0790..1c8bb87e47b 100644 --- a/src/freedreno/vulkan/tu_private.h +++ b/src/freedreno/vulkan/tu_private.h @@ -50,6 +50,7 @@ #include "util/macros.h" #include "vk_alloc.h" #include "vk_debug_report.h" +#include "wsi_common.h" #include "drm/msm_drm.h" #include "ir3/ir3_compiler.h" @@ -298,6 +299,8 @@ struct tu_physical_device uint8_t device_uuid[VK_UUID_SIZE]; uint8_t cache_uuid[VK_UUID_SIZE]; + struct wsi_device wsi_device; + int local_fd; int master_fd; @@ -338,6 +341,11 @@ struct tu_instance struct tu_instance_extension_table enabled_extensions; }; +VkResult +tu_wsi_init(struct tu_physical_device *physical_device); +void +tu_wsi_finish(struct tu_physical_device *physical_device); + bool tu_instance_extension_supported(const char *name); uint32_t diff --git a/src/freedreno/vulkan/tu_wsi.c b/src/freedreno/vulkan/tu_wsi.c new file mode 100644 index 00000000000..ce06a05d5d5 --- /dev/null +++ b/src/freedreno/vulkan/tu_wsi.c @@ -0,0 +1,272 @@ +/* + * Copyright © 2016 Red Hat + * based on intel anv code: + * Copyright © 2015 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "tu_private.h" + +#include "vk_util.h" +#include "wsi_common.h" + +static PFN_vkVoidFunction +tu_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName) +{ + return tu_lookup_entrypoint_unchecked(pName); +} + +VkResult +tu_wsi_init(struct tu_physical_device *physical_device) +{ + return wsi_device_init(&physical_device->wsi_device, + tu_physical_device_to_handle(physical_device), + tu_wsi_proc_addr, &physical_device->instance->alloc, + physical_device->master_fd); +} + +void +tu_wsi_finish(struct tu_physical_device *physical_device) +{ + wsi_device_finish(&physical_device->wsi_device, + &physical_device->instance->alloc); +} + +void +tu_DestroySurfaceKHR(VkInstance _instance, + VkSurfaceKHR _surface, + const VkAllocationCallbacks *pAllocator) +{ + TU_FROM_HANDLE(tu_instance, instance, _instance); + ICD_FROM_HANDLE(VkIcdSurfaceBase, surface, _surface); + + vk_free2(&instance->alloc, pAllocator, surface); +} + +VkResult +tu_GetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice physicalDevice, + uint32_t queueFamilyIndex, + VkSurfaceKHR surface, + VkBool32 *pSupported) +{ + TU_FROM_HANDLE(tu_physical_device, device, physicalDevice); + + return wsi_common_get_surface_support( + &device->wsi_device, queueFamilyIndex, surface, pSupported); +} + +VkResult +tu_GetPhysicalDeviceSurfaceCapabilitiesKHR( + VkPhysicalDevice physicalDevice, + VkSurfaceKHR surface, + VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) +{ + TU_FROM_HANDLE(tu_physical_device, device, physicalDevice); + + return wsi_common_get_surface_capabilities(&device->wsi_device, surface, + pSurfaceCapabilities); +} + +VkResult +tu_GetPhysicalDeviceSurfaceCapabilities2KHR( + VkPhysicalDevice physicalDevice, + const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, + VkSurfaceCapabilities2KHR *pSurfaceCapabilities) +{ + TU_FROM_HANDLE(tu_physical_device, device, physicalDevice); + + return wsi_common_get_surface_capabilities2( + &device->wsi_device, pSurfaceInfo, pSurfaceCapabilities); +} + +VkResult +tu_GetPhysicalDeviceSurfaceCapabilities2EXT( + VkPhysicalDevice physicalDevice, + VkSurfaceKHR surface, + VkSurfaceCapabilities2EXT *pSurfaceCapabilities) +{ + TU_FROM_HANDLE(tu_physical_device, device, physicalDevice); + + return wsi_common_get_surface_capabilities2ext( + &device->wsi_device, surface, pSurfaceCapabilities); +} + +VkResult +tu_GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice physicalDevice, + VkSurfaceKHR surface, + uint32_t *pSurfaceFormatCount, + VkSurfaceFormatKHR *pSurfaceFormats) +{ + TU_FROM_HANDLE(tu_physical_device, device, physicalDevice); + + return wsi_common_get_surface_formats( + &device->wsi_device, surface, pSurfaceFormatCount, pSurfaceFormats); +} + +VkResult +tu_GetPhysicalDeviceSurfaceFormats2KHR( + VkPhysicalDevice physicalDevice, + const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, + uint32_t *pSurfaceFormatCount, + VkSurfaceFormat2KHR *pSurfaceFormats) +{ + TU_FROM_HANDLE(tu_physical_device, device, physicalDevice); + + return wsi_common_get_surface_formats2(&device->wsi_device, pSurfaceInfo, + pSurfaceFormatCount, + pSurfaceFormats); +} + +VkResult +tu_GetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice physicalDevice, + VkSurfaceKHR surface, + uint32_t *pPresentModeCount, + VkPresentModeKHR *pPresentModes) +{ + TU_FROM_HANDLE(tu_physical_device, device, physicalDevice); + + return wsi_common_get_surface_present_modes( + &device->wsi_device, surface, pPresentModeCount, pPresentModes); +} + +VkResult +tu_CreateSwapchainKHR(VkDevice _device, + const VkSwapchainCreateInfoKHR *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkSwapchainKHR *pSwapchain) +{ + TU_FROM_HANDLE(tu_device, device, _device); + const VkAllocationCallbacks *alloc; + if (pAllocator) + alloc = pAllocator; + else + alloc = &device->alloc; + + return wsi_common_create_swapchain(&device->physical_device->wsi_device, + tu_device_to_handle(device), + pCreateInfo, alloc, pSwapchain); +} + +void +tu_DestroySwapchainKHR(VkDevice _device, + VkSwapchainKHR swapchain, + const VkAllocationCallbacks *pAllocator) +{ + TU_FROM_HANDLE(tu_device, device, _device); + const VkAllocationCallbacks *alloc; + + if (pAllocator) + alloc = pAllocator; + else + alloc = &device->alloc; + + wsi_common_destroy_swapchain(_device, swapchain, alloc); +} + +VkResult +tu_GetSwapchainImagesKHR(VkDevice device, + VkSwapchainKHR swapchain, + uint32_t *pSwapchainImageCount, + VkImage *pSwapchainImages) +{ + return wsi_common_get_images(swapchain, pSwapchainImageCount, + pSwapchainImages); +} + +VkResult +tu_AcquireNextImageKHR(VkDevice device, + VkSwapchainKHR swapchain, + uint64_t timeout, + VkSemaphore semaphore, + VkFence fence, + uint32_t *pImageIndex) +{ + VkAcquireNextImageInfoKHR acquire_info = { + .sType = VK_STRUCTURE_TYPE_ACQUIRE_NEXT_IMAGE_INFO_KHR, + .swapchain = swapchain, + .timeout = timeout, + .semaphore = semaphore, + .fence = fence, + .deviceMask = 0, + }; + + return tu_AcquireNextImage2KHR(device, &acquire_info, pImageIndex); +} + +VkResult +tu_AcquireNextImage2KHR(VkDevice _device, + const VkAcquireNextImageInfoKHR *pAcquireInfo, + uint32_t *pImageIndex) +{ + TU_FROM_HANDLE(tu_device, device, _device); + struct tu_physical_device *pdevice = device->physical_device; + + VkResult result = wsi_common_acquire_next_image2( + &pdevice->wsi_device, _device, pAcquireInfo, pImageIndex); + + /* TODO signal fence and semaphore */ + + return result; +} + +VkResult +tu_QueuePresentKHR(VkQueue _queue, const VkPresentInfoKHR *pPresentInfo) +{ + TU_FROM_HANDLE(tu_queue, queue, _queue); + return wsi_common_queue_present( + &queue->device->physical_device->wsi_device, + tu_device_to_handle(queue->device), _queue, queue->queue_family_index, + pPresentInfo); +} + +VkResult +tu_GetDeviceGroupPresentCapabilitiesKHR( + VkDevice device, VkDeviceGroupPresentCapabilitiesKHR *pCapabilities) +{ + memset(pCapabilities->presentMask, 0, sizeof(pCapabilities->presentMask)); + pCapabilities->presentMask[0] = 0x1; + pCapabilities->modes = VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_BIT_KHR; + + return VK_SUCCESS; +} + +VkResult +tu_GetDeviceGroupSurfacePresentModesKHR( + VkDevice device, + VkSurfaceKHR surface, + VkDeviceGroupPresentModeFlagsKHR *pModes) +{ + *pModes = VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_BIT_KHR; + + return VK_SUCCESS; +} + +VkResult +tu_GetPhysicalDevicePresentRectanglesKHR(VkPhysicalDevice physicalDevice, + VkSurfaceKHR surface, + uint32_t *pRectCount, + VkRect2D *pRects) +{ + TU_FROM_HANDLE(tu_physical_device, device, physicalDevice); + + return wsi_common_get_present_rectangles(&device->wsi_device, surface, + pRectCount, pRects); +} diff --git a/src/freedreno/vulkan/tu_wsi_wayland.c b/src/freedreno/vulkan/tu_wsi_wayland.c new file mode 100644 index 00000000000..b9148a1e28f --- /dev/null +++ b/src/freedreno/vulkan/tu_wsi_wayland.c @@ -0,0 +1,59 @@ +/* + * Copyright © 2016 Red Hat + * based on intel anv code: + * Copyright © 2015 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "tu_private.h" + +#include "wsi_common_wayland.h" + +VkBool32 +tu_GetPhysicalDeviceWaylandPresentationSupportKHR( + VkPhysicalDevice physicalDevice, + uint32_t queueFamilyIndex, + struct wl_display *display) +{ + TU_FROM_HANDLE(tu_physical_device, physical_device, physicalDevice); + + return wsi_wl_get_presentation_support(&physical_device->wsi_device, + display); +} + +VkResult +tu_CreateWaylandSurfaceKHR(VkInstance _instance, + const VkWaylandSurfaceCreateInfoKHR *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkSurfaceKHR *pSurface) +{ + TU_FROM_HANDLE(tu_instance, instance, _instance); + const VkAllocationCallbacks *alloc; + assert(pCreateInfo->sType == + VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR); + + if (pAllocator) + alloc = pAllocator; + else + alloc = &instance->alloc; + + return wsi_create_wl_surface(alloc, pCreateInfo, pSurface); +} -- 2.30.2