diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2021-07-22 10:17:30 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2021-07-22 10:17:30 +0000 |
| commit | ca11beabae33eb59fb981b8adf50b1d47a2a98f0 (patch) | |
| tree | 3e4691a396e6e54cd54224a190663d5cf976625b /lib/mesa/src/loader | |
| parent | 27c8a50e8bbde7d28b1fc46d715a4c469e24f2c4 (diff) | |
Import Mesa 21.1.5
Diffstat (limited to 'lib/mesa/src/loader')
| -rw-r--r-- | lib/mesa/src/loader/Android.mk | 4 | ||||
| -rw-r--r-- | lib/mesa/src/loader/meson.build | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lib/mesa/src/loader/Android.mk b/lib/mesa/src/loader/Android.mk index ca9218846..6aaaa1dac 100644 --- a/lib/mesa/src/loader/Android.mk +++ b/lib/mesa/src/loader/Android.mk @@ -35,6 +35,10 @@ LOCAL_SRC_FILES := \ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +ifneq ($(HAVE_GALLIUM_IRIS),) +LOCAL_CFLAGS += -DPREFER_IRIS +endif + LOCAL_MODULE := libmesa_loader include $(MESA_COMMON_MK) diff --git a/lib/mesa/src/loader/meson.build b/lib/mesa/src/loader/meson.build index e7dce88d4..34a43e33f 100644 --- a/lib/mesa/src/loader/meson.build +++ b/lib/mesa/src/loader/meson.build @@ -24,10 +24,11 @@ if with_platform_x11 and with_dri3 libloader_dri3_helper = static_library( 'loader_dri3_helper', 'loader_dri3_helper.c', - c_args : c_vis_args, + gnu_symbol_visibility : 'hidden', include_directories : [inc_include, inc_src], dependencies : [ dep_libdrm, dep_xcb_dri3, dep_xcb_present, dep_xcb_sync, dep_xshmfence, + dep_xcb_xfixes, ], build_by_default : false, ) @@ -36,7 +37,7 @@ else endif loader_c_args = [ - c_vis_args, '-DUSE_DRICONF', + '-DUSE_DRICONF', '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_search_path), ] @@ -48,7 +49,8 @@ libloader = static_library( 'loader', ['loader.c', 'pci_id_driver_map.c'], c_args : loader_c_args, + gnu_symbol_visibility : 'hidden', include_directories : [inc_include, inc_src, inc_util], - dependencies : [dep_libdrm, dep_thread, idep_xmlconfig_headers], + dependencies : [dep_libdrm, dep_thread], build_by_default : false, ) |