diff options
| author | Mauro Rossi <issor.oruam@gmail.com> | 2019-11-16 18:39:31 +0100 |
|---|---|---|
| committer | maurossi <issor.oruam@gmail.com> | 2019-12-04 22:46:32 +0000 |
| commit | 318cf926403cc4d73e2233ebe3ea88e38d507857 (patch) | |
| tree | d370eca4ae4c5ae4009c21ca73f090315ab8629e | |
| parent | 5b3d6979a61c2159d85aba2ca0960540c6b80b2d (diff) | |
| download | mesa-android-radeonsi-build-fix.tar.gz | |
android: radeonsi: fix build after vl refactoring (v2)android-radeonsi-build-fix
vl functions moved from radeonsi to gallium/auxiliary/vl have left
android build of radeonsi in broken state.
libmesa_galliumvl static is need to build readeonsi,
gallium_dri building rules are reworked to avoid multiple symbols
and libmesa_galliumvl static dependency is needed in radeonsi.
Here is the changelog:
- android: gallium/auxiliary: add libmesa_galliumvl static
- android: gallium_dri: move libmesa_gallium to static to prevent multiple symbols
- android: radeonsi: fix build after vl refactoring
Fixes the following building error:
external/mesa/src/gallium/drivers/radeonsi/si_uvd.c:47:
error: undefined reference to 'vl_video_buffer_create_as_resource'
clang.real: error: linker command failed with exit code 1 (use -v to see invocation)
Fixes: 86e60bc ("radeonsi: remove si_vid_join_surfaces and use combined planar allocations")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
| -rw-r--r-- | src/gallium/auxiliary/Android.mk | 11 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/Android.mk | 4 | ||||
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk index f7329963770..7e8b2d31e16 100644 --- a/src/gallium/auxiliary/Android.mk +++ b/src/gallium/auxiliary/Android.mk @@ -74,3 +74,14 @@ LOCAL_GENERATED_SOURCES += $(MESA_GEN_NIR_H) include $(GALLIUM_COMMON_MK) include $(BUILD_STATIC_LIBRARY) + +# Build libmesa_galliumvl used by radeonsi +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + $(VL_SOURCES) + +LOCAL_MODULE := libmesa_galliumvl + +include $(GALLIUM_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/drivers/radeonsi/Android.mk b/src/gallium/drivers/radeonsi/Android.mk index 6f81f3f5346..f69b0d9219e 100644 --- a/src/gallium/drivers/radeonsi/Android.mk +++ b/src/gallium/drivers/radeonsi/Android.mk @@ -40,7 +40,9 @@ LOCAL_C_INCLUDES := \ $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_amd_common,,)/common \ $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir -LOCAL_STATIC_LIBRARIES := libmesa_amd_common +LOCAL_STATIC_LIBRARIES := \ + libmesa_amd_common \ + libmesa_galliumvl LOCAL_SHARED_LIBRARIES := libdrm_radeon LOCAL_MODULE := libmesa_pipe_radeonsi diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index fa69b708c13..c666312b779 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -57,6 +57,7 @@ endif LOCAL_STATIC_LIBRARIES += \ libfreedreno_drm \ libfreedreno_ir3 \ + libmesa_gallium \ libpanfrost_bifrost \ libpanfrost_decode \ libpanfrost_encoder \ @@ -79,7 +80,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ libmesa_nir \ libmesa_dri_common \ libmesa_megadriver_stub \ - libmesa_gallium \ libmesa_pipe_loader \ libmesa_util \ libmesa_loader |