diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-02-21 17:27:20 -0800 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-02-23 17:17:06 +1000 |
| commit | 34ed5e4e601187a18d8b59ea5dbdc96de0bbdf21 (patch) | |
| tree | 177691b14e5f075d04ed60f08b692d588bef0e9a | |
| parent | deb44bc317d919171f8bad126a99ee6146ba0c89 (diff) | |
lavapipe: add dll definition file instead of using PUBLIC
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>
| -rw-r--r-- | src/gallium/frontends/lavapipe/lvp_device.c | 6 | ||||
| -rw-r--r-- | src/gallium/targets/lavapipe/meson.build | 1 | ||||
| -rw-r--r-- | src/gallium/targets/lavapipe/vulkan_lvp.def | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index af130be3c69..67550bcfee7 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -711,6 +711,12 @@ VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL lvp_GetInstanceProcAddr( 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 * to work around certain LD_PRELOAD issues seen in apps. */ diff --git a/src/gallium/targets/lavapipe/meson.build b/src/gallium/targets/lavapipe/meson.build index d64f7606412..55c227d5e40 100644 --- a/src/gallium/targets/lavapipe/meson.build +++ b/src/gallium/targets/lavapipe/meson.build @@ -1,6 +1,7 @@ libvulkan_lvp = shared_library( 'vulkan_lvp', [ '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 ], link_whole : [ liblavapipe_st ], link_with : [libpipe_loader_static, libgallium, libwsw, libswdri, libws_null, libswkmsdri ], diff --git a/src/gallium/targets/lavapipe/vulkan_lvp.def b/src/gallium/targets/lavapipe/vulkan_lvp.def new file mode 100644 index 00000000000..64a9caae593 --- /dev/null +++ b/src/gallium/targets/lavapipe/vulkan_lvp.def @@ -0,0 +1,4 @@ +EXPORTS +vk_icdNegotiateLoaderICDInterfaceVersion +vk_icdGetInstanceProcAddr +vk_icdGetPhysicalDeviceProcAddr |