From 15648530af61558f7f749e57b68f48a9fc86ad3e Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 22 Aug 2022 17:22:16 -0500 Subject: piglit: Add PACKAGECONFIG for glx and opencl - Allow GLX tests to be disabled for systems that don't support it. - Allow OpenCL tests to be enabled. - Disable GLX tests for i.MX GPU, the drivers don't support GLX - Enable OpenCL tests for i.MX 8 Signed-off-by: Tom Hochstein (cherry picked from commit 866368ac8fda2d8e45558d52867403a9e42a5e9a) --- ...ke-Don-t-enable-GLX-if-tests-are-disabled.patch | 32 ++++++++++++++++++++++ recipes-graphics/piglit/piglit_%.bbappend | 10 +++++++ 2 files changed, 42 insertions(+) create mode 100644 recipes-graphics/piglit/piglit/0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch create mode 100644 recipes-graphics/piglit/piglit_%.bbappend (limited to 'recipes-graphics/piglit') diff --git a/recipes-graphics/piglit/piglit/0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch b/recipes-graphics/piglit/piglit/0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch new file mode 100644 index 000000000..ef6fda0f4 --- /dev/null +++ b/recipes-graphics/piglit/piglit/0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch @@ -0,0 +1,32 @@ +From 13ff43fe760ac343b33d8e8c84b89886aac07116 Mon Sep 17 00:00:00 2001 +From: Tom Hochstein +Date: Fri, 3 Jun 2022 10:44:29 -0500 +Subject: [PATCH] cmake: Don't enable GLX if tests are disabled + +Allow building for systems that don't support GLX. + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/720] +Signed-off-by: Tom Hochstein +--- + CMakeLists.txt | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e1aeb5ddf..85e171aba 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -134,10 +134,7 @@ if(PIGLIT_BUILD_CL_TESTS) + endif(PIGLIT_BUILD_CL_TESTS) + + IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") +- if(X11_FOUND AND OPENGL_gl_LIBRARY) +- # Assume the system has GLX. In the future, systems may exist +- # with libGL and libX11 but no GLX, but that world hasn't +- # arrived yet. ++ if(X11_FOUND AND OPENGL_gl_LIBRARY AND PIGLIT_BUILD_GLX_TESTS) + set(PIGLIT_HAS_GLX True) + add_definitions(-DPIGLIT_HAS_GLX) + endif() +-- +2.17.1 + diff --git a/recipes-graphics/piglit/piglit_%.bbappend b/recipes-graphics/piglit/piglit_%.bbappend new file mode 100644 index 000000000..6a1b9b980 --- /dev/null +++ b/recipes-graphics/piglit/piglit_%.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch" + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glx', '', d)}" +PACKAGECONFIG:remove:imxgpu = "glx" +PACKAGECONFIG:append:mx8-nxp-bsp = " opencl" + +PACKAGECONFIG[glx] = "-DPIGLIT_BUILD_GLX_TESTS=ON,-DPIGLIT_BUILD_GLX_TESTS=OFF" +PACKAGECONFIG[opencl] = "-DPIGLIT_BUILD_CL_TESTS=ON,-DPIGLIT_BUILD_CL_TESTS=OFF,opencl-icd-loader" -- cgit v1.2.3-54-g00ecf