summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/piglit
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/piglit')
-rw-r--r--meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch41
-rw-r--r--meta/recipes-graphics/piglit/piglit_git.bb5
2 files changed, 2 insertions, 44 deletions
diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch
deleted file mode 100644
index e2e87cc1ed..0000000000
--- a/meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From cb562a383229074b44db6998b85572d2abe7c363 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linaro.org>
3Date: Fri, 24 Nov 2017 10:31:55 -0600
4Subject: [PATCH] tests/egl/egl-context-priority.c: Use
5 piglit_egl_get_default_display
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10The entry point is not guaranteed to exist, so use the
11piglit_egl_get_default_display() helper which does the correct thing.
12
13Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
14Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
15Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
16Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
17
18Upstream-Status: Backport
19
20https://cgit.freedesktop.org/piglit/commit/?id=cb562a3832
21---
22 tests/egl/egl-context-priority.c | 3 +--
23 1 file changed, 1 insertion(+), 2 deletions(-)
24
25diff --git a/tests/egl/egl-context-priority.c b/tests/egl/egl-context-priority.c
26index 7f26fc614..9590ccae3 100644
27--- a/tests/egl/egl-context-priority.c
28+++ b/tests/egl/egl-context-priority.c
29@@ -99,8 +99,7 @@ piglit_init(int argc, char **argv)
30 if (!strstr(exts, "EGL_MESA_platform_surfaceless"))
31 piglit_report_result(PIGLIT_SKIP);
32
33- dpy = eglGetPlatformDisplay(EGL_PLATFORM_SURFACELESS_MESA,
34- EGL_DEFAULT_DISPLAY, NULL);
35+ dpy = piglit_egl_get_default_display(EGL_PLATFORM_SURFACELESS_MESA);
36
37 ok = eglInitialize(dpy, &major, &minor);
38 if (!ok) {
39--
402.11.0
41
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 2839f1d285..b936ad8a73 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
5SRC_URI = "git://anongit.freedesktop.org/piglit \ 5SRC_URI = "git://anongit.freedesktop.org/piglit \
6 file://0001-cmake-install-bash-completions-in-the-right-place.patch \ 6 file://0001-cmake-install-bash-completions-in-the-right-place.patch \
7 file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \ 7 file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \
8 file://0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch \
9 " 8 "
10UPSTREAM_CHECK_COMMITS = "1" 9UPSTREAM_CHECK_COMMITS = "1"
11 10
12# From 2017-07-03 11# From 2018-02-26
13SRCREV = "c8f4fd9eeb298a2ef0855927f22634f794ef3eff" 12SRCREV = "4ce0887e2f7f848d2be2e435a2d0f3c80e44ea3b"
14# (when PV goes above 1.0 remove the trailing r) 13# (when PV goes above 1.0 remove the trailing r)
15PV = "1.0+gitr${SRCPV}" 14PV = "1.0+gitr${SRCPV}"
16 15