fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 07:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

lavapipe: add dll definition file instead of using PUBLIC

Browse source 
This avoids conflicts with the definitions in vk_icd.h

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9208>
This commit is contained in:
Dave Airlie 2021-02-21 17:27:20 -08:00
parent deb44bc317
commit 34ed5e4e60
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/frontends/lavapipe/lvp_device.c
View file

@ -711,6 +711,12 @@ VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL lvp_GetInstanceProcAddr(
pName); pName);
} }
/* Windows will use a dll definition file to avoid build errors. */
#ifdef _WIN32
#undef PUBLIC
#define PUBLIC
#endif
/* The loader wants us to expose a second GetInstanceProcAddr function /* The loader wants us to expose a second GetInstanceProcAddr function
* to work around certain LD_PRELOAD issues seen in apps. * to work around certain LD_PRELOAD issues seen in apps.
*/ */

1
src/gallium/targets/lavapipe/meson.build
View file

@ -1,6 +1,7 @@
libvulkan_lvp = shared_library( libvulkan_lvp = shared_library(
'vulkan_lvp', 'vulkan_lvp',
[ 'target.c' ], [ 'target.c' ],
vs_module_defs : 'vulkan_lvp.def',
include_directories : [ inc_src, inc_util, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_winsys, inc_gallium_drivers ], include_directories : [ inc_src, inc_util, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_winsys, inc_gallium_drivers ],
link_whole : [ liblavapipe_st ], link_whole : [ liblavapipe_st ],
link_with : [libpipe_loader_static, libgallium, libwsw, libswdri, libws_null, libswkmsdri ], link_with : [libpipe_loader_static, libgallium, libwsw, libswdri, libws_null, libswkmsdri ],

4
src/gallium/targets/lavapipe/vulkan_lvp.def Normal file
View file

@ -0,0 +1,4 @@
EXPORTS
vk_icdNegotiateLoaderICDInterfaceVersion
vk_icdGetInstanceProcAddr
vk_icdGetPhysicalDeviceProcAddr