@@ -99,7 +99,11 @@ PACKAGECONFIG:pn-glmark2 = "drm-gles2 wayland-gles2"
PACKAGECONFIG:pn-weston-init = ""
# Enable testing for opencl and vulkan with piglit
-PACKAGECONFIG:append:pn-piglit = " ${@bb.utils.filter("DISTRO_FEATURES", "opencl vulkan", d)}"
+PACKAGECONFIG:append:pn-piglit = " \
+ ${@bb.utils.filter("DISTRO_FEATURES", "opencl vulkan", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "deqp-gles", "", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "vulkan", "deqp-vk", "", d)} \
+"
PACKAGECONFIG:pn-opengl-es-cts = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "surfaceless", d)}"
PACKAGECONFIG:pn-vulkan-cts = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "surfaceless", d)}"
@@ -43,8 +43,6 @@ ARAGO_TEST = "\
ARAGO_TEST_EXTRAS = " \
python3-numpy \
piglit \
- ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "opengl-es-cts", "", d)} \
- ${@bb.utils.contains("DISTRO_FEATURES", "vulkan", "vulkan-cts", "", d)} \
"
ARAGO_TEST:append:armv7a = " \
new file mode 100644
@@ -0,0 +1,30 @@
+# add a config to point piglit at the default install location for deqp tests
+# if they are selected
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+PACKAGECONFIG[deqp-gles] = ",,,opengl-es-cts"
+PACKAGECONFIG[deqp-vk] = ",,,vulkan-cts"
+
+do_install:append() {
+ if ${@bb.utils.contains('PACKAGECONFIG', 'deqp-gles', 'true', 'false', d)}; then
+ printf "%s\n" \
+ "[deqp-egl]" \
+ "bin=/usr/lib/opengl-es-cts/deqp-egl" \
+ "[deqp-gles2]" \
+ "bin=/usr/lib/opengl-es-cts/deqp-gles2" \
+ "[deqp-gles3]" \
+ "bin=/usr/lib/opengl-es-cts/deqp-gles3" \
+ "[deqp-gles31]" \
+ "bin=/usr/lib/opengl-es-cts/deqp-gles31" \
+ >> ${D}/${libdir}/piglit/piglit.conf
+ fi
+ if ${@bb.utils.contains('PACKAGECONFIG', 'deqp-vk', 'true', 'false', d)}; then
+ printf "%s\n" \
+ "[deqp-vk]" \
+ "bin=/usr/lib/vulkan-cts/deqp-vk" \
+ "[deqp-vksc]" \
+ "bin=/usr/lib/vulkan-cts/deqp-vksc" \
+ >> ${D}/${libdir}/piglit/piglit.conf
+ fi
+}