gallium: Move -DHAVE_PIPE_LOADER_DRI and -DHAVE_PIPE_LOADER_KMS to be pre_args
There is non pipe-loader source code depends on it. After doing this, we found that shared library pipe_swrast depends on libswdri The error message is: src/gallium/targets/pipe-loader/pipe_swrast.so.p/pipe_swrast.c.o:pipe_swrast.c:swrast_driver_descriptor: error: undefined reference to 'dri_create_sw_winsys' src/gallium/targets/pipe-loader/pipe_swrast.so.p/pipe_swrast.c.o:pipe_swrast.c:swrast_driver_descriptor: error: undefined reference to 'kms_dri_create_winsys' Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17784>
This commit is contained in:
parent
155c8bc964
commit
34572042c7
|
@ -1689,6 +1689,13 @@ if dep_libdrm.found()
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if with_dri
|
||||||
|
pre_args += '-DHAVE_PIPE_LOADER_DRI'
|
||||||
|
endif
|
||||||
|
if with_gallium_drisw_kms
|
||||||
|
pre_args += '-DHAVE_PIPE_LOADER_KMS'
|
||||||
|
endif
|
||||||
|
|
||||||
dep_libudev = dependency('libudev', required : false)
|
dep_libudev = dependency('libudev', required : false)
|
||||||
if dep_libudev.found()
|
if dep_libudev.found()
|
||||||
pre_args += '-DHAVE_LIBUDEV'
|
pre_args += '-DHAVE_LIBUDEV'
|
||||||
|
|
|
@ -33,12 +33,6 @@ if dep_libdrm.found()
|
||||||
files_pipe_loader += files('pipe_loader_drm.c')
|
files_pipe_loader += files('pipe_loader_drm.c')
|
||||||
libpipe_loader_links += libloader
|
libpipe_loader_links += libloader
|
||||||
endif
|
endif
|
||||||
if with_dri
|
|
||||||
libpipe_loader_defines += '-DHAVE_PIPE_LOADER_DRI'
|
|
||||||
endif
|
|
||||||
if with_gallium_drisw_kms
|
|
||||||
libpipe_loader_defines += '-DHAVE_PIPE_LOADER_KMS'
|
|
||||||
endif
|
|
||||||
|
|
||||||
libpipe_loader_static = static_library(
|
libpipe_loader_static = static_library(
|
||||||
'pipe_loader_static',
|
'pipe_loader_static',
|
||||||
|
|
|
@ -67,7 +67,7 @@ pipe_loaders = [
|
||||||
[with_gallium_freedreno, 'msm', driver_freedreno, []],
|
[with_gallium_freedreno, 'msm', driver_freedreno, []],
|
||||||
[with_gallium_kmsro, 'kmsro', _kmsro_targets, []],
|
[with_gallium_kmsro, 'kmsro', _kmsro_targets, []],
|
||||||
[with_gallium_svga, 'vmwgfx', driver_svga, []],
|
[with_gallium_svga, 'vmwgfx', driver_svga, []],
|
||||||
[with_gallium_softpipe, 'swrast', driver_swrast, [libwsw, libws_null]],
|
[with_gallium_softpipe, 'swrast', driver_swrast, [libwsw, libws_null, libswdri, libswkmsdri]],
|
||||||
]
|
]
|
||||||
|
|
||||||
foreach x : pipe_loaders
|
foreach x : pipe_loaders
|
||||||
|
|
Loading…
Reference in New Issue