diff options
author | Zoltán Böszörményi <zboszor@gmail.com> | 2022-03-16 14:47:02 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-18 23:32:46 +0000 |
commit | 6a89afe15610fa1d89a4c6c2c858c481fbcb8052 (patch) | |
tree | beb9298342430d9cbfc65bd99a216a9af0d1a350 /meta/recipes-graphics/mesa | |
parent | 12464bf798344beca382d1691138132edcf9b5f0 (diff) | |
download | poky-6a89afe15610fa1d89a4c6c2c858c481fbcb8052.tar.gz |
mesa: Allow building Mesa's OpenCL through PACKAGECONFIG
(From OE-Core rev: 78d17787eb4dd65dacde785dbb47359726c22173)
Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 116a9ed861..e8c07a4563 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -74,7 +74,6 @@ MESON_BUILDTYPE = "${@check_buildtype(d)}" | |||
74 | 74 | ||
75 | EXTRA_OEMESON = " \ | 75 | EXTRA_OEMESON = " \ |
76 | -Dshared-glapi=enabled \ | 76 | -Dshared-glapi=enabled \ |
77 | -Dgallium-opencl=disabled \ | ||
78 | -Dglx-read-only-text=true \ | 77 | -Dglx-read-only-text=true \ |
79 | -Dplatforms='${@",".join("${PLATFORMS}".split())}' \ | 78 | -Dplatforms='${@",".join("${PLATFORMS}".split())}' \ |
80 | " | 79 | " |
@@ -120,6 +119,9 @@ PACKAGECONFIG[gles] = "-Dgles1=enabled -Dgles2=enabled, -Dgles1=disabled -Dgles2 | |||
120 | # "egl" requires "opengl" | 119 | # "egl" requires "opengl" |
121 | PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled" | 120 | PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled" |
122 | 121 | ||
122 | # "opencl" requires libclc from meta-clang and spirv-tools from OE-Core | ||
123 | PACKAGECONFIG[opencl] = "-Dgallium-opencl=icd -Dopencl-spirv=true,-Dgallium-opencl=disabled -Dopencl-spirv=false,libclc spirv-tools" | ||
124 | |||
123 | PACKAGECONFIG[broadcom] = "" | 125 | PACKAGECONFIG[broadcom] = "" |
124 | PACKAGECONFIG[etnaviv] = "" | 126 | PACKAGECONFIG[etnaviv] = "" |
125 | PACKAGECONFIG[freedreno] = "" | 127 | PACKAGECONFIG[freedreno] = "" |
@@ -188,6 +190,8 @@ RDEPENDS:${PN}-dev = "" | |||
188 | # development package of libgles3. | 190 | # development package of libgles3. |
189 | RDEPENDS:libgles3-mesa-dev += "libgles2-mesa-dev" | 191 | RDEPENDS:libgles3-mesa-dev += "libgles2-mesa-dev" |
190 | 192 | ||
193 | RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'libclc spirv-tools', '', d)}" | ||
194 | |||
191 | PACKAGES =+ "libegl-mesa libegl-mesa-dev \ | 195 | PACKAGES =+ "libegl-mesa libegl-mesa-dev \ |
192 | libosmesa libosmesa-dev \ | 196 | libosmesa libosmesa-dev \ |
193 | libgl-mesa libgl-mesa-dev \ | 197 | libgl-mesa libgl-mesa-dev \ |
@@ -196,6 +200,7 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \ | |||
196 | libgles1-mesa libgles1-mesa-dev \ | 200 | libgles1-mesa libgles1-mesa-dev \ |
197 | libgles2-mesa libgles2-mesa-dev \ | 201 | libgles2-mesa libgles2-mesa-dev \ |
198 | libgles3-mesa libgles3-mesa-dev \ | 202 | libgles3-mesa libgles3-mesa-dev \ |
203 | libopencl-mesa libopencl-mesa-dev \ | ||
199 | libxatracker libxatracker-dev \ | 204 | libxatracker libxatracker-dev \ |
200 | mesa-megadriver mesa-vulkan-drivers \ | 205 | mesa-megadriver mesa-vulkan-drivers \ |
201 | mesa-vdpau-drivers \ | 206 | mesa-vdpau-drivers \ |
@@ -228,7 +233,8 @@ python __anonymous() { | |||
228 | ("opengl", "libgl", "libgl1"), | 233 | ("opengl", "libgl", "libgl1"), |
229 | ("gles", "libgles1", "libglesv1-cm1"), | 234 | ("gles", "libgles1", "libglesv1-cm1"), |
230 | ("gles", "libgles2", "libglesv2-2"), | 235 | ("gles", "libgles2", "libglesv2-2"), |
231 | ("gles", "libgles3",)): | 236 | ("gles", "libgles3",), |
237 | ("opencl", "libopencl",)): | ||
232 | if not p[0] in pkgconfig: | 238 | if not p[0] in pkgconfig: |
233 | continue | 239 | continue |
234 | mlprefix = d.getVar("MLPREFIX") | 240 | mlprefix = d.getVar("MLPREFIX") |
@@ -288,6 +294,7 @@ FILES:libgbm = "${libdir}/libgbm.so.*" | |||
288 | FILES:libgles1-mesa = "${libdir}/libGLESv1*.so.*" | 294 | FILES:libgles1-mesa = "${libdir}/libGLESv1*.so.*" |
289 | FILES:libgles2-mesa = "${libdir}/libGLESv2.so.*" | 295 | FILES:libgles2-mesa = "${libdir}/libGLESv2.so.*" |
290 | FILES:libgl-mesa = "${libdir}/libGL.so.*" | 296 | FILES:libgl-mesa = "${libdir}/libGL.so.*" |
297 | FILES:libopencl-mesa = "${libdir}/libMesaOpenCL.so.* ${sysconfdir}/OpenCL/vendors/mesa.icd" | ||
291 | FILES:libglapi = "${libdir}/libglapi.so.*" | 298 | FILES:libglapi = "${libdir}/libglapi.so.*" |
292 | FILES:libosmesa = "${libdir}/libOSMesa.so.*" | 299 | FILES:libosmesa = "${libdir}/libOSMesa.so.*" |
293 | FILES:libxatracker = "${libdir}/libxatracker.so.*" | 300 | FILES:libxatracker = "${libdir}/libxatracker.so.*" |
@@ -300,6 +307,7 @@ FILES:libglapi-dev = "${libdir}/libglapi.*" | |||
300 | FILES:libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" | 307 | FILES:libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" |
301 | FILES:libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" | 308 | FILES:libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" |
302 | FILES:libgles3-mesa-dev = "${includedir}/GLES3" | 309 | FILES:libgles3-mesa-dev = "${includedir}/GLES3" |
310 | FILES:libopencl-mesa-dev = "${libdir}/libMesaOpenCL.so" | ||
303 | FILES:libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc" | 311 | FILES:libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc" |
304 | FILES:libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ | 312 | FILES:libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ |
305 | ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ | 313 | ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ |