diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2017-07-07 13:59:08 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-11 15:57:08 +0100 |
commit | 715b05e9e193200c2e41fe4881b2ab1fdb639cc2 (patch) | |
tree | 0b4f08b8666bb4853beccd8366cd4d748a982ba0 /meta/recipes-graphics/piglit/piglit/0002-util-egl-Honour-Surfaceless-MESA-in-get_default_disp.patch | |
parent | 854c8c2e4c24ea3ddfec6e5b5f6477f0620510e4 (diff) | |
download | poky-715b05e9e193200c2e41fe4881b2ab1fdb639cc2.tar.gz |
piglit: Update to current git master
Update, remove backported patches.
(From OE-Core rev: 6733936c432a4e73c8dc63099c6abf7e393a1f93)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/piglit/piglit/0002-util-egl-Honour-Surfaceless-MESA-in-get_default_disp.patch')
-rw-r--r-- | meta/recipes-graphics/piglit/piglit/0002-util-egl-Honour-Surfaceless-MESA-in-get_default_disp.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/meta/recipes-graphics/piglit/piglit/0002-util-egl-Honour-Surfaceless-MESA-in-get_default_disp.patch b/meta/recipes-graphics/piglit/piglit/0002-util-egl-Honour-Surfaceless-MESA-in-get_default_disp.patch deleted file mode 100644 index 39f0d86cfe..0000000000 --- a/meta/recipes-graphics/piglit/piglit/0002-util-egl-Honour-Surfaceless-MESA-in-get_default_disp.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From aa6728cc4941a87e3933c2aa770ab8ae3080b870 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <daniel.diaz@linaro.org> | ||
3 | Date: Tue, 16 May 2017 12:37:07 -0500 | ||
4 | Subject: [PATCH 2/4] util/egl: Honour Surfaceless MESA in get_default_display | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> | ||
10 | Upstream-Status: Pending | ||
11 | --- | ||
12 | tests/util/piglit-util-egl.c | 7 +++++++ | ||
13 | 1 file changed, 7 insertions(+) | ||
14 | |||
15 | diff --git a/tests/util/piglit-util-egl.c b/tests/util/piglit-util-egl.c | ||
16 | index 106c735..389fe12 100644 | ||
17 | --- a/tests/util/piglit-util-egl.c | ||
18 | +++ b/tests/util/piglit-util-egl.c | ||
19 | @@ -85,6 +85,7 @@ piglit_egl_get_default_display(EGLenum platform) | ||
20 | static bool has_x11 = false; | ||
21 | static bool has_wayland = false; | ||
22 | static bool has_gbm = false; | ||
23 | + static bool has_surfaceless_mesa = false; | ||
24 | |||
25 | static EGLDisplay (*peglGetPlatformDisplayEXT)(EGLenum platform, void *native_display, const EGLint *attrib_list); | ||
26 | |||
27 | @@ -99,6 +100,7 @@ piglit_egl_get_default_display(EGLenum platform) | ||
28 | has_x11 = piglit_is_egl_extension_supported(EGL_NO_DISPLAY, "EGL_EXT_platform_x11"); | ||
29 | has_wayland = piglit_is_egl_extension_supported(EGL_NO_DISPLAY, "EGL_EXT_platform_wayland"); | ||
30 | has_gbm = piglit_is_egl_extension_supported(EGL_NO_DISPLAY, "EGL_EXT_platform_gbm"); | ||
31 | + has_surfaceless_mesa = piglit_is_egl_extension_supported(EGL_NO_DISPLAY, "EGL_MESA_platform_surfaceless"); | ||
32 | |||
33 | peglGetPlatformDisplayEXT = (void*) eglGetProcAddress("eglGetPlatformDisplayEXT"); | ||
34 | } | ||
35 | @@ -123,6 +125,11 @@ piglit_egl_get_default_display(EGLenum platform) | ||
36 | return EGL_NO_DISPLAY; | ||
37 | } | ||
38 | break; | ||
39 | + case EGL_PLATFORM_SURFACELESS_MESA: | ||
40 | + if (!has_surfaceless_mesa) { | ||
41 | + return EGL_NO_DISPLAY; | ||
42 | + } | ||
43 | + break; | ||
44 | default: | ||
45 | fprintf(stderr, "%s: unrecognized platform %#x\n", __func__, platform); | ||
46 | return EGL_NO_DISPLAY; | ||
47 | -- | ||
48 | 1.9.1 | ||
49 | |||