diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2016-07-28 14:40:08 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-08-18 14:53:30 +0100 |
| commit | 40e4fff563ef1448656b1d3e6c11f5bd0c0b9e8a (patch) | |
| tree | 92ad369d0f04dd367d8523bb0156648727203856 /src/intel | |
| parent | b0d56f2f4f1f4f7ecdf96f0a0246d0db5392e075 (diff) | |
anv: automake: use VISIBILITY_CFLAGS to restrict symbol visibility
Hide the internal symbols and annotate the vk_icdGetInstanceProcAddr as public
since the loader needs it (since v1 of the loader interface).
v2: Add VISIBILITY_CFLAGS to AM_CFLAGS (Ken)
Cc: "12.0" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> (v1)
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'src/intel')
| -rw-r--r-- | src/intel/vulkan/Makefile.am | 4 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_device.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index 73db8f5d052..c621c346426 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -61,7 +61,9 @@ AM_CPPFLAGS = \ -I$(top_builddir)/src/intel \ -I$(top_srcdir)/src/intel -AM_CFLAGS = -Wno-override-init -msse2 +AM_CFLAGS = \ + $(VISIBILITY_CFLAGS) \ + -Wno-override-init -msse2 libanv_gen7_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=70 libanv_gen7_la_SOURCES = $(GEN7_FILES) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index e64790e9685..3f1334bdef6 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -659,13 +659,15 @@ PFN_vkVoidFunction anv_GetInstanceProcAddr( return anv_lookup_entrypoint(pName); } -/* The loader wants us to expose a second GetInstanceProcAddr function - * to work around certain LD_PRELOAD issues seen in apps. +/* With version 1+ of the loader interface the ICD should expose + * vk_icdGetInstanceProcAddr to work around certain LD_PRELOAD issues seen in apps. */ +PUBLIC VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr( VkInstance instance, const char* pName); +PUBLIC VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr( VkInstance instance, const char* pName) |