From 162f1f55669c46fc794416e0dbe33d9a2f5fcd65 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 23 May 2025 19:53:28 +0200 Subject: [PATCH] delete xa leftovers Fixes: 3be2c47db2318ebe9222 ("delete the XA frontend") Part-of: --- src/compiler/nir/meson.build | 1 - src/gallium/frontends/mediafoundation/readme.md | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build index 0310331d441..7a9ee0ba58b 100644 --- a/src/compiler/nir/meson.build +++ b/src/compiler/nir/meson.build @@ -83,7 +83,6 @@ with_nir_headers_only = ( with_gallium_vdpau, with_gallium_va, with_any_vk, - with_gallium_xa, with_gallium_st_d3d10umd, with_gallium_rusticl, with_microsoft_clc, diff --git a/src/gallium/frontends/mediafoundation/readme.md b/src/gallium/frontends/mediafoundation/readme.md index fa61826ddcc..986cad20202 100644 --- a/src/gallium/frontends/mediafoundation/readme.md +++ b/src/gallium/frontends/mediafoundation/readme.md @@ -42,7 +42,7 @@ Current implementation is designed to build three differt codec (AV1, H264, HEVC To build the COM based H264 codec, you can use the following command to setup the build (please run the setup under the mesa folder, and by default the output will go to c:\bin) ``` -meson setup build/ --pkg-config-path="C:\lib\pkgconfig" -Dgallium-d3d12-graphics=disabled -Dintel-elk=false -Dmicrosoft-clc=disabled -Dllvm=disabled -Dvalgrind=disabled -Dlmsensors=disabled -Dzlib=disabled -Dzstd=disabled -Dxmlconfig=disabled -Dgles1=disabled -Dgles2=disabled -Degl=disabled -Dgbm=disabled -Dglx-direct=false -Denable-glcpp-tests=false -Dopengl=false -Dgallium-drivers=d3d12 -Dgallium-xa=disabled -Dgallium-vdpau=disabled -Dgallium-va=disabled -Dgallium-mediafoundation=enabled -Dc_args="/guard:cf /we4146 /we4308 /we4509 /we4510 /we4532 /we4533 /we4610 /we4700 /we4789 /wd4703" -Dc_link_args="/guard:cf /profile /DYNAMICBASE" -Dcpp_args="/guard:cf /we4146 /we4308 /we4509 /we4510 /we4532 /we4533 /we4610 /we4700 /we4789 /wd4703" -Dcpp_link_args="/guard:cf /profile /DYNAMICBASE" --default-library=static -Db_vscrt=mt -Dc_std=c17 -Dcpp_std=c++17 -Dmicrosoft-clc=disabled -Ddebug=false --buildtype=release -Dwarning_level=2 -Dvideo-codecs=h264enc -Dmediafoundation-windows-dll-name="msh264enchmft" -Dmediafoundation-store-dll=false -Dgallium-mediafoundation-test=true +meson setup build/ --pkg-config-path="C:\lib\pkgconfig" -Dgallium-d3d12-graphics=disabled -Dintel-elk=false -Dmicrosoft-clc=disabled -Dllvm=disabled -Dvalgrind=disabled -Dlmsensors=disabled -Dzlib=disabled -Dzstd=disabled -Dxmlconfig=disabled -Dgles1=disabled -Dgles2=disabled -Degl=disabled -Dgbm=disabled -Dglx-direct=false -Denable-glcpp-tests=false -Dopengl=false -Dgallium-drivers=d3d12 -Dgallium-vdpau=disabled -Dgallium-va=disabled -Dgallium-mediafoundation=enabled -Dc_args="/guard:cf /we4146 /we4308 /we4509 /we4510 /we4532 /we4533 /we4610 /we4700 /we4789 /wd4703" -Dc_link_args="/guard:cf /profile /DYNAMICBASE" -Dcpp_args="/guard:cf /we4146 /we4308 /we4509 /we4510 /we4532 /we4533 /we4610 /we4700 /we4789 /wd4703" -Dcpp_link_args="/guard:cf /profile /DYNAMICBASE" --default-library=static -Db_vscrt=mt -Dc_std=c17 -Dcpp_std=c++17 -Dmicrosoft-clc=disabled -Ddebug=false --buildtype=release -Dwarning_level=2 -Dvideo-codecs=h264enc -Dmediafoundation-windows-dll-name="msh264enchmft" -Dmediafoundation-store-dll=false -Dgallium-mediafoundation-test=true ``` To build the COM based HEVC codec, use the above command but replace all instances of h264enc with h265enc to setup the build. Similarly for the pending AV1 codec, replace h264enc with av1enc. @@ -63,4 +63,4 @@ To build, run the following command from the mesa folder. ``` ninja -C build/ install -``` \ No newline at end of file +```