Initial commit
This commit is contained in:
Your Name
+35
@@ -0,0 +1,35 @@
|
||||
From 26faa2c157a27a18a9f767976730fe0c115e3af4 Mon Sep 17 00:00:00 2001
|
||||
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
Date: Wed, 13 Jul 2016 19:19:02 +0300
|
||||
Subject: [PATCH] cmake: install bash-completions in the right place
|
||||
|
||||
The completionsdir variable is a full path and should not be
|
||||
prefixed.
|
||||
|
||||
This does mean the files may be installed outside of
|
||||
CMAKE_INSTALL_PREFIX -- the alternative is more difficult and
|
||||
means that bash completion files may be installed where
|
||||
bash-completion can't find them.
|
||||
|
||||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
Upstream-Status: Submitted [mailing list]
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8e2abba..784a8f9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -532,7 +532,7 @@ install (
|
||||
if (BASH_COMPLETION_FOUND)
|
||||
install(
|
||||
FILES completions/bash/piglit
|
||||
- DESTINATION ${CMAKE_INSTALL_PREFIX}/${BASH_COMPLETION_COMPLETIONSDIR}/
|
||||
+ DESTINATION ${BASH_COMPLETION_COMPLETIONSDIR}/
|
||||
)
|
||||
endif (BASH_COMPLETION_FOUND)
|
||||
|
||||
--
|
||||
2.8.1
|
||||
|
||||
+53
@@ -0,0 +1,53 @@
|
||||
From cd38c91e8c743bfc1841bcdd08e1ab18bf22f0e1 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 3 May 2023 21:59:43 -0700
|
||||
Subject: [PATCH] tests: Fix narrowing errors seen with clang
|
||||
|
||||
Fixes
|
||||
piglit-test-pattern.cpp:656:26: error: type 'float' cannot be narrowed to 'int' in initiali
|
||||
zer list [-Wc++11-narrowing]
|
||||
|
||||
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/807]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
.../spec/ext_framebuffer_multisample/draw-buffers-common.cpp | 4 ++--
|
||||
tests/util/piglit-test-pattern.cpp | 4 ++--
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/tests/spec/ext_framebuffer_multisample/draw-buffers-common.cpp b/tests/spec/ext_framebuffer_multisample/draw-buffers-common.cpp
|
||||
index 48e1ad4a5..b36830c45 100644
|
||||
--- a/tests/spec/ext_framebuffer_multisample/draw-buffers-common.cpp
|
||||
+++ b/tests/spec/ext_framebuffer_multisample/draw-buffers-common.cpp
|
||||
@@ -353,8 +353,8 @@ draw_pattern(bool sample_alpha_to_coverage,
|
||||
float vertices[4][2] = {
|
||||
{ 0.0f, 0.0f + i * (pattern_height / num_rects) },
|
||||
{ 0.0f, (i + 1.0f) * (pattern_height / num_rects) },
|
||||
- { pattern_width, (i + 1.0f) * (pattern_height / num_rects) },
|
||||
- { pattern_width, 0.0f + i * (pattern_height / num_rects) } };
|
||||
+ { static_cast<float>(pattern_width), (i + 1.0f) * (pattern_height / num_rects) },
|
||||
+ { static_cast<float>(pattern_width), 0.0f + i * (pattern_height / num_rects) } };
|
||||
|
||||
glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE,
|
||||
sizeof(vertices[0]),
|
||||
diff --git a/tests/util/piglit-test-pattern.cpp b/tests/util/piglit-test-pattern.cpp
|
||||
index 43d451d6a..52ee94457 100644
|
||||
--- a/tests/util/piglit-test-pattern.cpp
|
||||
+++ b/tests/util/piglit-test-pattern.cpp
|
||||
@@ -653,12 +653,12 @@ ColorGradientSunburst::draw_with_scale_and_offset(const float (*proj)[4],
|
||||
{
|
||||
switch (out_type) {
|
||||
case GL_INT: {
|
||||
- int clear_color[4] = { offset, offset, offset, offset };
|
||||
+ int clear_color[4] = { static_cast<int>(offset), static_cast<int>(offset), static_cast<int>(offset), static_cast<int>(offset) };
|
||||
glClearBufferiv(GL_COLOR, 0, clear_color);
|
||||
break;
|
||||
}
|
||||
case GL_UNSIGNED_INT: {
|
||||
- unsigned clear_color[4] = { offset, offset, offset, offset };
|
||||
+ unsigned clear_color[4] = { static_cast<unsigned>(offset), static_cast<unsigned>(offset), static_cast<unsigned>(offset), static_cast<unsigned>(offset) };
|
||||
glClearBufferuiv(GL_COLOR, 0, clear_color);
|
||||
break;
|
||||
}
|
||||
--
|
||||
2.40.1
|
||||
|
||||
+32
@@ -0,0 +1,32 @@
|
||||
From 3bf1beee1ddd19bc536ff2856e04ac269d43daa2 Mon Sep 17 00:00:00 2001
|
||||
From: Pascal Bach <pascal.bach@siemens.com>
|
||||
Date: Thu, 4 Oct 2018 14:43:17 +0200
|
||||
Subject: [PATCH] cmake: use proper WAYLAND_INCLUDE_DIRS variable
|
||||
|
||||
WAYLAND_wayland-client_INCLUDEDIR is an internal variable and is not correctly
|
||||
set when cross compiling. WAYLAND_INCLUDE_DIRS includes the correct path even
|
||||
when cross compiling.
|
||||
|
||||
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
|
||||
|
||||
Upstream-Status: Submitted [piglit@lists.freedesktop.org]
|
||||
---
|
||||
tests/util/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
|
||||
index a5f080156..a303a9f58 100644
|
||||
--- a/tests/util/CMakeLists.txt
|
||||
+++ b/tests/util/CMakeLists.txt
|
||||
@@ -97,7 +97,7 @@ if(PIGLIT_USE_WAFFLE)
|
||||
piglit-framework-gl/piglit_wl_framework.c
|
||||
)
|
||||
list(APPEND UTIL_GL_INCLUDES
|
||||
- ${WAYLAND_wayland-client_INCLUDEDIR}
|
||||
+ ${WAYLAND_INCLUDE_DIRS}
|
||||
)
|
||||
endif()
|
||||
if(PIGLIT_HAS_X11)
|
||||
--
|
||||
2.11.0
|
||||
|
||||
+30
@@ -0,0 +1,30 @@
|
||||
From 1c67250308a92d4991ed05d9d240090ab84accae Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Tue, 10 Nov 2020 17:13:50 +0000
|
||||
Subject: [PATCH 2/2] tests/util/piglit-shader.c: do not hardcode build path
|
||||
into target binary
|
||||
|
||||
This helps reproducibilty.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
tests/util/piglit-shader.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/util/piglit-shader.c b/tests/util/piglit-shader.c
|
||||
index 4fd68d21e..c9ea8295e 100644
|
||||
--- a/tests/util/piglit-shader.c
|
||||
+++ b/tests/util/piglit-shader.c
|
||||
@@ -73,7 +73,7 @@ piglit_compile_shader(GLenum target, const char *filename)
|
||||
|
||||
source_dir = getenv("PIGLIT_SOURCE_DIR");
|
||||
if (source_dir == NULL) {
|
||||
- source_dir = SOURCE_DIR;
|
||||
+ source_dir = ".";
|
||||
}
|
||||
|
||||
snprintf(filename_with_path, FILENAME_MAX - 1,
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
SUMMARY = "OpenGL driver testing framework"
|
||||
DESCRIPTION = "Piglit is an open-source test suite for OpenGL and OpenCL \
|
||||
implementations."
|
||||
HOMEPAGE = "https://gitlab.freedesktop.org/mesa/piglit"
|
||||
BUGTRACKER = "https://gitlab.freedesktop.org/mesa/piglit/-/issues"
|
||||
LICENSE = "MIT & LGPL-2.0-or-later & GPL-3.0-only & GPL-2.0-or-later & BSD-3-Clause"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
|
||||
|
||||
SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=main \
|
||||
file://0001-cmake-install-bash-completions-in-the-right-place.patch \
|
||||
file://0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \
|
||||
file://0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch \
|
||||
file://0001-tests-Fix-narrowing-errors-seen-with-clang.patch \
|
||||
"
|
||||
UPSTREAM_CHECK_COMMITS = "1"
|
||||
|
||||
SRCREV = "5036601c43fff63f7be5cd8ad7b319a5c1f6652c"
|
||||
# (when PV goes above 1.0 remove the trailing r)
|
||||
PV = "1.0+gitr${SRCPV}"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
X11_DEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxrender libglu', '', d)}"
|
||||
X11_RDEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa-demos', '', d)}"
|
||||
|
||||
DEPENDS = "libpng waffle libxkbcommon python3-mako-native python3-numpy-native python3-six-native virtual/egl"
|
||||
|
||||
inherit cmake pkgconfig python3native features_check bash-completion
|
||||
|
||||
# depends on virtual/libgl
|
||||
REQUIRED_DISTRO_FEATURES += "opengl"
|
||||
|
||||
# The built scripts go into the temporary directory according to tempfile
|
||||
# (typically /tmp) which can race if multiple builds happen on the same machine,
|
||||
# so tell it to use a directory in ${B} to avoid overwriting.
|
||||
export TEMP = "${B}/temp/"
|
||||
do_compile[dirs] =+ "${B}/temp/"
|
||||
|
||||
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glx', '', d)}"
|
||||
PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut,"
|
||||
PACKAGECONFIG[glx] = "-DPIGLIT_BUILD_GLX_TESTS=ON,-DPIGLIT_BUILD_GLX_TESTS=OFF"
|
||||
PACKAGECONFIG[opencl] = "-DPIGLIT_BUILD_CL_TESTS=ON,-DPIGLIT_BUILD_CL_TESTS=OFF,virtual/opencl-icd"
|
||||
PACKAGECONFIG[x11] = "-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}"
|
||||
PACKAGECONFIG[vulkan] = "-DPIGLIT_BUILD_VK_TESTS=ON,-DPIGLIT_BUILD_VK_TESTS=OFF,glslang-native vulkan-loader,glslang"
|
||||
|
||||
export PIGLIT_BUILD_DIR = "../../../../git"
|
||||
|
||||
do_configure:prepend() {
|
||||
if [ "${@bb.utils.contains('PACKAGECONFIG', 'freeglut', 'yes', 'no', d)}" = "no" ]; then
|
||||
sed -i -e "/^#.*include <GL\/freeglut_ext.h>$/d" ${S}/src/piglit/glut_wrap.h
|
||||
sed -i -e "/^#.*include.*<GL\/glut.h>$/d" ${S}/src/piglit/glut_wrap.h
|
||||
fi
|
||||
}
|
||||
|
||||
# Forcibly strip because Piglit is *huge*, and don't bother trying to split/strip the result.
|
||||
OECMAKE_TARGET_INSTALL = "install/strip"
|
||||
INHIBIT_PACKAGE_STRIP = "1"
|
||||
INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
|
||||
|
||||
RDEPENDS:${PN} = "waffle waffle-bin python3 python3-mako python3-json \
|
||||
python3-misc \
|
||||
python3-unixadmin python3-xml python3-multiprocessing \
|
||||
python3-six python3-shell python3-io \
|
||||
python3-netserver bash \
|
||||
"
|
||||
|
||||
INSANE_SKIP:${PN} += "dev-so already-stripped"
|
||||
|
||||
# As nothing builds against Piglit we don't need to have anything in the
|
||||
# sysroot, especially when this is ~2GB of test suite
|
||||
SYSROOT_DIRS:remove = "${libdir}"
|
||||
|
||||
# Can't be built with ccache
|
||||
CCACHE_DISABLE = "1"
|
||||
Reference in New Issue
Block a user