Commit dbac8e25 authored by Keith Packard's avatar Keith Packard

radv: Add EXT_acquire_xlib_display to radv driver [v2]

This extension adds the ability to borrow an X RandR output for
temporary use directly by a Vulkan application to the radv driver.

v2:
	Simplify addition of VK_USE_PLATFORM_XLIB_XRANDR_KHR to
	vulkan_wsi_args
Suggested-by: 's avatarEric Engestrom <eric.engestrom@imgtec.com>
Signed-off-by: 's avatarKeith Packard <keithp@keithp.com>
Reviewed-by: 's avatarJason Ekstrand <jason@jlekstrand.net>
parent 46090a64
...@@ -85,7 +85,14 @@ AM_CPPFLAGS += \ ...@@ -85,7 +85,14 @@ AM_CPPFLAGS += \
-DVK_USE_PLATFORM_DISPLAY_KHR -DVK_USE_PLATFORM_DISPLAY_KHR
VULKAN_SOURCES += $(VULKAN_WSI_DISPLAY_FILES) VULKAN_SOURCES += $(VULKAN_WSI_DISPLAY_FILES)
endif
if HAVE_XLIB_LEASE
AM_CPPFLAGS += \
-DVK_USE_PLATFORM_XLIB_XRANDR_EXT \
$(XCB_RANDR_CFLAGS)
VULKAN_LIB_DEPS += $(XCB_RANDR_LIBS)
endif endif
if HAVE_PLATFORM_X11 if HAVE_PLATFORM_X11
......
...@@ -120,6 +120,11 @@ if with_platform_drm ...@@ -120,6 +120,11 @@ if with_platform_drm
libradv_files += files('radv_wsi_display.c') libradv_files += files('radv_wsi_display.c')
endif endif
if with_xlib_lease
radv_deps += dep_xcb_xrandr
radv_flags += '-DVK_USE_PLATFORM_XLIB_XRANDR_EXT'
endif
libvulkan_radeon = shared_library( libvulkan_radeon = shared_library(
'vulkan_radeon', 'vulkan_radeon',
[libradv_files, radv_entrypoints, radv_extensions_c, vk_format_table_c], [libradv_files, radv_entrypoints, radv_extensions_c, vk_format_table_c],
......
...@@ -449,7 +449,10 @@ def get_entrypoints_defines(doc): ...@@ -449,7 +449,10 @@ def get_entrypoints_defines(doc):
for extension in doc.findall('./extensions/extension[@platform]'): for extension in doc.findall('./extensions/extension[@platform]'):
platform = extension.attrib['platform'] platform = extension.attrib['platform']
define = 'VK_USE_PLATFORM_' + platform.upper() + '_KHR' ext = '_KHR'
if platform.upper() == 'XLIB_XRANDR':
ext = '_EXT'
define = 'VK_USE_PLATFORM_' + platform.upper() + ext
for entrypoint in extension.findall('./require/command'): for entrypoint in extension.findall('./require/command'):
fullname = entrypoint.attrib['name'] fullname = entrypoint.attrib['name']
......
...@@ -88,6 +88,7 @@ EXTENSIONS = [ ...@@ -88,6 +88,7 @@ EXTENSIONS = [
Extension('VK_KHR_multiview', 1, True), Extension('VK_KHR_multiview', 1, True),
Extension('VK_KHR_display', 23, 'VK_USE_PLATFORM_DISPLAY_KHR'), Extension('VK_KHR_display', 23, 'VK_USE_PLATFORM_DISPLAY_KHR'),
Extension('VK_EXT_direct_mode_display', 1, 'VK_USE_PLATFORM_DISPLAY_KHR'), Extension('VK_EXT_direct_mode_display', 1, 'VK_USE_PLATFORM_DISPLAY_KHR'),
Extension('VK_EXT_acquire_xlib_display', 1, 'VK_USE_PLATFORM_XLIB_XRANDR_EXT'),
Extension('VK_EXT_debug_report', 9, True), Extension('VK_EXT_debug_report', 9, True),
Extension('VK_EXT_depth_range_unrestricted', 1, True), Extension('VK_EXT_depth_range_unrestricted', 1, True),
Extension('VK_EXT_descriptor_indexing', 2, True), Extension('VK_EXT_descriptor_indexing', 2, True),
...@@ -216,12 +217,12 @@ _TEMPLATE_C = Template(COPYRIGHT + """ ...@@ -216,12 +217,12 @@ _TEMPLATE_C = Template(COPYRIGHT + """
#include "vk_util.h" #include "vk_util.h"
/* Convert the VK_USE_PLATFORM_* defines to booleans */ /* Convert the VK_USE_PLATFORM_* defines to booleans */
%for platform in ['ANDROID', 'WAYLAND', 'XCB', 'XLIB', 'DISPLAY']: %for platform in ['ANDROID_KHR', 'WAYLAND_KHR', 'XCB_KHR', 'XLIB_KHR', 'DISPLAY_KHR', 'XLIB_XRANDR_EXT']:
#ifdef VK_USE_PLATFORM_${platform}_KHR #ifdef VK_USE_PLATFORM_${platform}
# undef VK_USE_PLATFORM_${platform}_KHR # undef VK_USE_PLATFORM_${platform}
# define VK_USE_PLATFORM_${platform}_KHR true # define VK_USE_PLATFORM_${platform} true
#else #else
# define VK_USE_PLATFORM_${platform}_KHR false # define VK_USE_PLATFORM_${platform} false
#endif #endif
%endfor %endfor
......
...@@ -164,3 +164,33 @@ radv_ReleaseDisplayEXT(VkPhysicalDevice physical_device, ...@@ -164,3 +164,33 @@ radv_ReleaseDisplayEXT(VkPhysicalDevice physical_device,
&pdevice->wsi_device, &pdevice->wsi_device,
display); display);
} }
#ifdef VK_USE_PLATFORM_XLIB_XRANDR_EXT
VkResult
radv_AcquireXlibDisplayEXT(VkPhysicalDevice physical_device,
Display *dpy,
VkDisplayKHR display)
{
RADV_FROM_HANDLE(radv_physical_device, pdevice, physical_device);
return wsi_acquire_xlib_display(physical_device,
&pdevice->wsi_device,
dpy,
display);
}
VkResult
radv_GetRandROutputDisplayEXT(VkPhysicalDevice physical_device,
Display *dpy,
RROutput output,
VkDisplayKHR *display)
{
RADV_FROM_HANDLE(radv_physical_device, pdevice, physical_device);
return wsi_get_randr_output_display(physical_device,
&pdevice->wsi_device,
dpy,
output,
display);
}
#endif /* VK_USE_PLATFORM_XLIB_XRANDR_EXT */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment