return anv_lookup_entrypoint(&physical_device->info, pName);
}
-static uint64_t
-anv_wsi_image_get_modifier(VkImage _image)
+static void
+anv_wsi_signal_semaphore_for_memory(VkDevice _device,
+ VkSemaphore _semaphore,
+ VkDeviceMemory _memory)
{
- ANV_FROM_HANDLE(anv_image, image, _image);
- return image->drm_format_mod;
+ ANV_FROM_HANDLE(anv_device, device, _device);
+ ANV_FROM_HANDLE(anv_semaphore, semaphore, _semaphore);
+ ANV_FROM_HANDLE(anv_device_memory, memory, _memory);
+
+ /* Put a BO semaphore with the image BO in the temporary. For BO binary
+ * semaphores, we always set EXEC_OBJECT_WRITE so this creates a WaR
+ * hazard with the display engine's read to ensure that no one writes to
+ * the image before the read is complete.
+ */
+ anv_semaphore_reset_temporary(device, semaphore);
+
+ struct anv_semaphore_impl *impl = &semaphore->temporary;
+ impl->type = ANV_SEMAPHORE_TYPE_WSI_BO;
+ impl->bo = anv_bo_ref(memory->bo);
+}
+
+static void
+anv_wsi_signal_fence_for_memory(VkDevice _device,
+ VkFence _fence,
+ VkDeviceMemory _memory)
+{
+ ANV_FROM_HANDLE(anv_device, device, _device);
+ ANV_FROM_HANDLE(anv_fence, fence, _fence);
+ ANV_FROM_HANDLE(anv_device_memory, memory, _memory);
+
+ /* Put a BO fence with the image BO in the temporary. For BO fences, we
+ * always just wait until the BO isn't busy and reads from the BO should
+ * count as busy.
+ */
+ anv_fence_reset_temporary(device, fence);
+
+ struct anv_fence_impl *impl = &fence->temporary;
+ impl->type = ANV_FENCE_TYPE_WSI_BO;
+ impl->bo.bo = anv_bo_ref(memory->bo);
+ impl->bo.state = ANV_BO_FENCE_STATE_SUBMITTED;
}
VkResult
result = wsi_device_init(&physical_device->wsi_device,
anv_physical_device_to_handle(physical_device),
anv_wsi_proc_addr,
- &physical_device->instance->alloc);
+ &physical_device->instance->alloc,
+ physical_device->master_fd,
+ &physical_device->instance->dri_options);
if (result != VK_SUCCESS)
return result;
physical_device->wsi_device.supports_modifiers = true;
- physical_device->wsi_device.image_get_modifier = anv_wsi_image_get_modifier;
+ physical_device->wsi_device.signal_semaphore_for_memory =
+ anv_wsi_signal_semaphore_for_memory;
+ physical_device->wsi_device.signal_fence_for_memory =
+ anv_wsi_signal_fence_for_memory;
return VK_SUCCESS;
}
ANV_FROM_HANDLE(anv_physical_device, device, physicalDevice);
return wsi_common_get_surface_support(&device->wsi_device,
- device->local_fd,
queueFamilyIndex,
surface,
- &device->instance->alloc,
pSupported);
}
pSurfaceCapabilities);
}
+VkResult anv_GetPhysicalDeviceSurfaceCapabilities2EXT(
+ VkPhysicalDevice physicalDevice,
+ VkSurfaceKHR surface,
+ VkSurfaceCapabilities2EXT* pSurfaceCapabilities)
+{
+ ANV_FROM_HANDLE(anv_physical_device, device, physicalDevice);
+
+ return wsi_common_get_surface_capabilities2ext(&device->wsi_device,
+ surface,
+ pSurfaceCapabilities);
+}
+
VkResult anv_GetPhysicalDeviceSurfaceFormatsKHR(
VkPhysicalDevice physicalDevice,
VkSurfaceKHR surface,
VkSwapchainKHR* pSwapchain)
{
ANV_FROM_HANDLE(anv_device, device, _device);
- struct wsi_device *wsi_device = &device->instance->physicalDevice.wsi_device;
+ struct wsi_device *wsi_device = &device->physical->wsi_device;
const VkAllocationCallbacks *alloc;
if (pAllocator)
alloc = pAllocator;
else
- alloc = &device->alloc;
+ alloc = &device->vk.alloc;
- return wsi_common_create_swapchain(wsi_device, _device, device->fd,
+ return wsi_common_create_swapchain(wsi_device, _device,
pCreateInfo, alloc, pSwapchain);
}
if (pAllocator)
alloc = pAllocator;
else
- alloc = &device->alloc;
+ alloc = &device->vk.alloc;
wsi_common_destroy_swapchain(_device, swapchain, alloc);
}
}
VkResult anv_AcquireNextImageKHR(
- VkDevice _device,
+ VkDevice device,
VkSwapchainKHR swapchain,
uint64_t timeout,
VkSemaphore semaphore,
VkFence fence,
uint32_t* pImageIndex)
{
- ANV_FROM_HANDLE(anv_device, device, _device);
- struct anv_physical_device *pdevice = &device->instance->physicalDevice;
-
- VkResult result = wsi_common_acquire_next_image(&pdevice->wsi_device,
- _device,
- swapchain,
- timeout,
- semaphore,
- pImageIndex);
+ VkAcquireNextImageInfoKHR acquire_info = {
+ .sType = VK_STRUCTURE_TYPE_ACQUIRE_NEXT_IMAGE_INFO_KHR,
+ .swapchain = swapchain,
+ .timeout = timeout,
+ .semaphore = semaphore,
+ .fence = fence,
+ .deviceMask = 0,
+ };
+
+ return anv_AcquireNextImage2KHR(device, &acquire_info, pImageIndex);
+}
- /* Thanks to implicit sync, the image is ready immediately. However, we
- * should wait for the current GPU state to finish.
- */
- if (fence != VK_NULL_HANDLE)
- anv_QueueSubmit(anv_queue_to_handle(&device->queue), 0, NULL, fence);
+VkResult anv_AcquireNextImage2KHR(
+ VkDevice _device,
+ const VkAcquireNextImageInfoKHR* pAcquireInfo,
+ uint32_t* pImageIndex)
+{
+ ANV_FROM_HANDLE(anv_device, device, _device);
- return result;
+ return wsi_common_acquire_next_image2(&device->physical->wsi_device,
+ _device, pAcquireInfo, pImageIndex);
}
VkResult anv_QueuePresentKHR(
const VkPresentInfoKHR* pPresentInfo)
{
ANV_FROM_HANDLE(anv_queue, queue, _queue);
- struct anv_physical_device *pdevice =
- &queue->device->instance->physicalDevice;
+ struct anv_device *device = queue->device;
- return wsi_common_queue_present(&pdevice->wsi_device,
+ if (device->debug_frame_desc) {
+ device->debug_frame_desc->frame_id++;
+ if (!device->info.has_llc) {
+ gen_clflush_range(device->debug_frame_desc,
+ sizeof(*device->debug_frame_desc));
+ }
+ }
+
+ return wsi_common_queue_present(&queue->device->physical->wsi_device,
anv_device_to_handle(queue->device),
_queue, 0,
pPresentInfo);
return VK_SUCCESS;
}
+
+VkResult anv_GetPhysicalDevicePresentRectanglesKHR(
+ VkPhysicalDevice physicalDevice,
+ VkSurfaceKHR surface,
+ uint32_t* pRectCount,
+ VkRect2D* pRects)
+{
+ ANV_FROM_HANDLE(anv_physical_device, device, physicalDevice);
+
+ return wsi_common_get_present_rectangles(&device->wsi_device,
+ surface,
+ pRectCount, pRects);
+}
projects / mesa.git / blobdiff