>> --- a/src/gallium/Android.mk >> +++ b/src/gallium/Android.mk >> @@ -34,7 +34,9 @@ SUBDIRS += auxiliary/pipe-loader >> # >> >> # swrast >> -ifneq ($(filter swrast,$(MESA_GPU_DRIVERS)),) >> +ifneq ($(filter llvmpipe,$(MESA_GPU_DRIVERS)),) >> +SUBDIRS += winsys/sw/dri drivers/llvmpipe drivers/softpipe >> +else ifneq ($(filter softpipe,$(MESA_GPU_DRIVERS)),) >> SUBDIRS += winsys/sw/dri drivers/softpipe > Won't this lead to having the same SUBDIRS multiple times if one has > both softpipe and llvmpipe in MESA_GPU_DRIVERS ?
The 'else ifneq' should prevent this issue from happening, because either llvmpipe path or softpipe path will be followed. > > > >> --- a/src/gallium/targets/dri/Android.mk >> +++ b/src/gallium/targets/dri/Android.mk >> @@ -81,7 +81,11 @@ endif >> gallium_DRIVERS += libmesa_winsys_radeon libmesa_pipe_radeon >> libmesa_amdgpu_addrlib >> LOCAL_SHARED_LIBRARIES += libdrm_radeon >> endif >> -ifneq ($(filter swrast,$(MESA_GPU_DRIVERS)),) >> +ifneq ($(filter llvmpipe,$(MESA_GPU_DRIVERS)),) >> +gallium_DRIVERS += libmesa_pipe_llvmpipe libmesa_pipe_softpipe >> libmesa_winsys_sw_dri >> +LOCAL_CFLAGS += -DGALLIUM_LLVMPIPE -DGALLIUM_SOFTPIPE >> +LOCAL_SHARED_LIBRARIES += libLLVM >> +else ifeq ($(filter softpipe,$(MESA_GPU_DRIVERS)),) >> gallium_DRIVERS += libmesa_pipe_softpipe libmesa_winsys_sw_dri >> LOCAL_CFLAGS += -DGALLIUM_SOFTPIPE > Similar to the SUBDIRS this will cause issues when both llvm and soft > -pipe are set, correct ? > > Thanks > Emil Same happens here, it's either llvmpipe or softpipe: ifneq ($(filter llvmpipe,$(MESA_GPU_DRIVERS)),) ... else ifneq ($(filter softpipe,$(MESA_GPU_DRIVERS)),) ... If I remove the 'else' and put both both llvmpipe and softpipe in BoardConfig.mk (BOARD_GPU_DRIVERS) I see WHOLE_STATIC_LIBRARIES causing building error due to double symbols, while the 'else' allows to build without errors I've performed several builds without issues Mauro _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
