anv: Add EXT_acquire_xlib_display to anv driver [v3]
This extension adds the ability to borrow an X RandR output for temporary use directly by a Vulkan application to the anv driver. v2: Simplify addition of VK_USE_PLATFORM_XLIB_XRANDR_KHR to vulkan_wsi_args Suggested-by: Eric Engestrom <eric.engestrom@imgtec.com> v3: Add extension to list in alphabetical order Suggested-by: Jason Ekstrand <jason@jlekstrand.net> Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
parent
7ab1fffcd2
commit
46090a642d
|
@ -199,6 +199,13 @@ VULKAN_CPPFLAGS += \
|
||||||
VULKAN_SOURCES += $(VULKAN_WSI_DISPLAY_FILES)
|
VULKAN_SOURCES += $(VULKAN_WSI_DISPLAY_FILES)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if HAVE_XLIB_LEASE
|
||||||
|
VULKAN_CPPFLAGS += \
|
||||||
|
-DVK_USE_PLATFORM_XLIB_XRANDR_EXT \
|
||||||
|
$(XCB_RANDR_CFLAGS)
|
||||||
|
VULKAN_LIB_DEPS += $(XCB_RANDR_LIBS)
|
||||||
|
endif
|
||||||
|
|
||||||
noinst_LTLIBRARIES += vulkan/libvulkan_common.la
|
noinst_LTLIBRARIES += vulkan/libvulkan_common.la
|
||||||
vulkan_libvulkan_common_la_SOURCES = $(VULKAN_SOURCES)
|
vulkan_libvulkan_common_la_SOURCES = $(VULKAN_SOURCES)
|
||||||
vulkan_libvulkan_common_la_CFLAGS = $(VULKAN_CFLAGS)
|
vulkan_libvulkan_common_la_CFLAGS = $(VULKAN_CFLAGS)
|
||||||
|
|
|
@ -513,7 +513,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']
|
||||||
|
|
|
@ -110,6 +110,7 @@ EXTENSIONS = [
|
||||||
Extension('VK_KHR_xlib_surface', 6, 'VK_USE_PLATFORM_XLIB_KHR'),
|
Extension('VK_KHR_xlib_surface', 6, 'VK_USE_PLATFORM_XLIB_KHR'),
|
||||||
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_acquire_xlib_display', 1, 'VK_USE_PLATFORM_XLIB_XRANDR_EXT'),
|
||||||
Extension('VK_EXT_debug_report', 8, True),
|
Extension('VK_EXT_debug_report', 8, True),
|
||||||
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_external_memory_dma_buf', 1, True),
|
Extension('VK_EXT_external_memory_dma_buf', 1, True),
|
||||||
|
|
|
@ -103,12 +103,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
|
||||||
|
|
||||||
|
|
|
@ -144,3 +144,33 @@ anv_ReleaseDisplayEXT(VkPhysicalDevice physical_device,
|
||||||
&pdevice->wsi_device,
|
&pdevice->wsi_device,
|
||||||
display);
|
display);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_XLIB_XRANDR_EXT
|
||||||
|
VkResult
|
||||||
|
anv_AcquireXlibDisplayEXT(VkPhysicalDevice physical_device,
|
||||||
|
Display *dpy,
|
||||||
|
VkDisplayKHR display)
|
||||||
|
{
|
||||||
|
ANV_FROM_HANDLE(anv_physical_device, pdevice, physical_device);
|
||||||
|
|
||||||
|
return wsi_acquire_xlib_display(physical_device,
|
||||||
|
&pdevice->wsi_device,
|
||||||
|
dpy,
|
||||||
|
display);
|
||||||
|
}
|
||||||
|
|
||||||
|
VkResult
|
||||||
|
anv_GetRandROutputDisplayEXT(VkPhysicalDevice physical_device,
|
||||||
|
Display *dpy,
|
||||||
|
RROutput output,
|
||||||
|
VkDisplayKHR *display)
|
||||||
|
{
|
||||||
|
ANV_FROM_HANDLE(anv_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 */
|
||||||
|
|
|
@ -169,6 +169,11 @@ if with_platform_drm
|
||||||
libanv_files += files('anv_wsi_display.c')
|
libanv_files += files('anv_wsi_display.c')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if with_xlib_lease
|
||||||
|
anv_deps += dep_xcb_xrandr
|
||||||
|
anv_flags += '-DVK_USE_PLATFORM_XLIB_XRANDR_EXT'
|
||||||
|
endif
|
||||||
|
|
||||||
libanv_common = static_library(
|
libanv_common = static_library(
|
||||||
'anv_common',
|
'anv_common',
|
||||||
[libanv_files, anv_entrypoints, anv_extensions_c, anv_extensions_h],
|
[libanv_files, anv_entrypoints, anv_extensions_c, anv_extensions_h],
|
||||||
|
|
Loading…
Reference in New Issue