OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iris: fix build with gallium nine

Browse Source 
Signed-off-by: Andre Heider <a.heider@gmail.com>
This commit is contained in:
Andre Heider
2019-02-06 02:26:45 +01:00
committed by Kenneth Graunke
parent be49fb051d
commit f89a578818
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
meson.build
View File

@@ -618,7 +618,8 @@ if with_gallium_st_nine
if not with_gallium_softpipe if not with_gallium_softpipe
error('The nine state tracker requires gallium softpipe/llvmpipe.') error('The nine state tracker requires gallium softpipe/llvmpipe.')
elif not (with_gallium_radeonsi or with_gallium_nouveau or with_gallium_r600 elif not (with_gallium_radeonsi or with_gallium_nouveau or with_gallium_r600
or with_gallium_r300 or with_gallium_svga or with_gallium_i915) or with_gallium_r300 or with_gallium_svga or with_gallium_i915
or with_gallium_iris)
error('The nine state tracker requires at least one non-swrast gallium driver.') error('The nine state tracker requires at least one non-swrast gallium driver.')
endif endif
if not with_dri3 if not with_dri3

4
src/gallium/targets/d3dadapter9/meson.build
View File

@@ -50,12 +50,12 @@ libgallium_nine = shared_library(
link_with : [ link_with : [
libgalliumvl_stub, libgallium, libnine_st, libmesa_util, libgalliumvl_stub, libgallium, libnine_st, libmesa_util,
libpipe_loader_static, libws_null, libwsw, libswdri, libpipe_loader_static, libws_null, libwsw, libswdri,
libswkmsdri, libswkmsdri, libnir,
], ],
dependencies : [ dependencies : [
dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_thread, dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_thread,
driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau, driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
driver_i915, driver_svga, driver_i915, driver_svga, driver_iris
], ],
name_prefix : '', name_prefix : '',
version : '.'.join(nine_version), version : '.'.join(nine_version),