diff options
author | Maxin B. John <maxin.john@intel.com> | 2018-02-27 17:40:41 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-01 22:13:55 +0000 |
commit | eac885c618fee967c2491d220ce3ea335533e2c2 (patch) | |
tree | 5ea233f5138c5071b223af92ba1842d2b534a5b9 | |
parent | 805fb404eb6bbd115fc1c98accd78ff194812979 (diff) | |
download | poky-eac885c618fee967c2491d220ce3ea335533e2c2.tar.gz |
piglit: upgrade to current git master
Upgrade to revision:
4ce0887e2f7f848d2be2e435a2d0f3c80e44ea3b
remove backported patch:
0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch
(From OE-Core rev: fa724345831253a2a2379b9fccc116d32a3d18d3)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch | 41 | ||||
-rw-r--r-- | meta/recipes-graphics/piglit/piglit_git.bb | 5 |
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 @@ | |||
1 | From cb562a383229074b44db6998b85572d2abe7c363 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linaro.org> | ||
3 | Date: Fri, 24 Nov 2017 10:31:55 -0600 | ||
4 | Subject: [PATCH] tests/egl/egl-context-priority.c: Use | ||
5 | piglit_egl_get_default_display | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | The entry point is not guaranteed to exist, so use the | ||
11 | piglit_egl_get_default_display() helper which does the correct thing. | ||
12 | |||
13 | Signed-off-by: Aníbal Limón <anibal.limon@linaro.org> | ||
14 | Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> | ||
15 | Reviewed-by: Tapani Pälli <tapani.palli@intel.com> | ||
16 | Reviewed-by: Emil Velikov <emil.velikov@collabora.com> | ||
17 | |||
18 | Upstream-Status: Backport | ||
19 | |||
20 | https://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 | |||
25 | diff --git a/tests/egl/egl-context-priority.c b/tests/egl/egl-context-priority.c | ||
26 | index 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 | -- | ||
40 | 2.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" | |||
5 | SRC_URI = "git://anongit.freedesktop.org/piglit \ | 5 | SRC_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 | " |
10 | UPSTREAM_CHECK_COMMITS = "1" | 9 | UPSTREAM_CHECK_COMMITS = "1" |
11 | 10 | ||
12 | # From 2017-07-03 | 11 | # From 2018-02-26 |
13 | SRCREV = "c8f4fd9eeb298a2ef0855927f22634f794ef3eff" | 12 | SRCREV = "4ce0887e2f7f848d2be2e435a2d0f3c80e44ea3b" |
14 | # (when PV goes above 1.0 remove the trailing r) | 13 | # (when PV goes above 1.0 remove the trailing r) |
15 | PV = "1.0+gitr${SRCPV}" | 14 | PV = "1.0+gitr${SRCPV}" |
16 | 15 | ||