<div dir="ltr">Looks like nice cleanup, but is someone still using llvm 3.2 or older?<div><br></div><div>With PACKAGECONFIG for almost each gallium driver it might be easier to get rid of GALLIUMDRIVERS_LLVM33, GALLIUMDRIVERS_LLVM33_ENABLED, GALLIUMDRIVERS_LLVM variables and use just GALLIUMDRIVERS.</div><div><br></div><div>In worst case scenario people using llvm 3.2 or older will need to redefine some of these PACKAGECONFIGs but that shouldn't be big issue considering that they probably have different mesa recipe already.</div><div><br></div><div>People can then select right list of drivers with or without using gallium-llvm as well.</div><div><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Jun 13, 2019 at 7:54 PM Marco Felsch <<a href="mailto:m.felsch@pengutronix.de">m.felsch@pengutronix.de</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Most of the time we are compiling for embedded targets which have<br>
dedicated hardware combinations. Enabling swrast by default isn't a good<br>
solution for such devices because if the hardware render node has an<br>
issue or doesn't support a special format/request Mesa will fallback to<br>
the software renderer. This will make it harder to debug performance<br>
issues.<br>
<br>
A better way is to let the user decide if a software renderer is<br>
needed e.g. if the system has no hardware renderer or to have such a<br>
fallback device. This way the user knows that the software renderer is<br>
enabled.<br>
<br>
Signed-off-by: Marco Felsch <<a href="mailto:m.felsch@pengutronix.de" target="_blank">m.felsch@pengutronix.de</a>><br>
---<br>
v3<br>
- rebased on current master-next branch<br>
<br>
meta/recipes-graphics/mesa/mesa.inc | 22 +++++++++++++---------<br>
1 file changed, 13 insertions(+), 9 deletions(-)<br>
<br>
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc<br>
index 3ecfb8506c..a6d36cf21c 100644<br>
--- a/meta/recipes-graphics/mesa/mesa.inc<br>
+++ b/meta/recipes-graphics/mesa/mesa.inc<br>
@@ -90,23 +90,27 @@ PACKAGECONFIG[egl] = "-Degl=true, -Degl=false"<br>
<br>
PACKAGECONFIG[etnaviv] = ""<br>
PACKAGECONFIG[kmsro] = ""<br>
+PACKAGECONFIG[swrast] = ""<br>
<br>
-GALLIUMDRIVERS = "swrast"<br>
-GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}"<br>
-GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'kmsro', ',kmsro', '', d)}"<br>
+GALLIUMDRIVERS = ""<br>
+GALLIUMDRIVERS +="${@bb.utils.contains('PACKAGECONFIG', 'swrast', 'swrast', '', d)}"<br>
+GALLIUMDRIVERS +="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', 'etnaviv', '', d)}"<br>
+GALLIUMDRIVERS +="${@bb.utils.contains('PACKAGECONFIG', 'kmsro', 'kmsro', '', d)}"<br>
<br>
# radeonsi requires LLVM<br>
-GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',radeonsi', '', d)}"<br>
+GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi', '', d)}"<br>
GALLIUMDRIVERS_LLVM33_ENABLED = "${@oe.utils.version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}"<br>
-GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"<br>
+GALLIUMDRIVERS_LLVM = "r300 svga nouveau ${@'${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"<br>
<br>
PACKAGECONFIG[r600] = ""<br>
<br>
-GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}"<br>
-GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600', '', d)}"<br>
-GALLIUMDRIVERS_append = ",virgl"<br>
+GALLIUMDRIVERS += "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', '${GALLIUMDRIVERS_LLVM}', '', d)}"<br>
+GALLIUMDRIVERS += "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'r600', '', d)}"<br>
+GALLIUMDRIVERS += "virgl"<br>
+GALLIUMDRIVERS_MESON = "${@",".join("${GALLIUMDRIVERS}".split())}"<br>
+<br>
+PACKAGECONFIG[gallium] = "-Dgallium-drivers=${GALLIUMDRIVERS_MESON}, -Dgallium-drivers=''"<br>
<br>
-PACKAGECONFIG[gallium] = "-Dgallium-drivers=${GALLIUMDRIVERS}, -Dgallium-drivers=''"<br>
MESA_LLVM_RELEASE ?= "8.0.0"<br>
PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true, -Dllvm=false, llvm${MESA_LLVM_RELEASE} llvm-native \<br>
${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"<br>
-- <br>
2.20.1<br>
<br>
-- <br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div>