Skip to contentSkip to conversation

recipes-graphics/piglit: Add patch for fix build in HiKey platforms

PATCH Superseded Aníbal Limón 3 participants 4 messages Nov 24, 2017 – Nov 27, 2017

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Aníbal Limón

author
#0 lore raw

PATCH 1/1 recipes-graphics/piglit: Add patch for fix build in HiKey platforms

From: Aníbal Limón <[email protected]>

Some EGL implementations do not actually ship all Khronos-extensions. As it turns out, the Mali 450 driver does not include eglGetPlatformDisplay symbol so there is not grauntee to exists use piglit_egl_get_default_display wrapper instead.

Signed-off-by Aníbal Limón <[email protected]>
Signed-off-by Daniel Díaz <[email protected]>
---
 ...gl-context-priority.c-Use-piglit_egl_get_.patch | 39 ++++++++++++++++++++++
 meta/recipes-graphics/piglit/piglit_git.bb         |  1 +
 2 files changed, 40 insertions(+)
 create mode 100644 meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch
meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch new file +39 -0
new file mode 100644
index 0000000000..6b73950fc1
@@ -0,0 +1,39 @@
+From 3b6c3abe3698abb0ae08d14a399eea29805cafd6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <[email protected]>
+Date: Fri, 24 Nov 2017 10:11:42 -0600
+Subject: [PATCH] tests/egl/egl-context-priority.c: Use
+ piglit_egl_get_default_display
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some EGL implementations do not actually ship all Khronos-extensions.
+As it turns out, the Mali 450 driver does not include eglGetPlatformDisplay
+symbol so there is not grauntee to exists use piglit_egl_get_default_display
+wrapper instead. See rev 45095dc08b.
+
+Signed-off-by: Aníbal Limón <[email protected]>
+Signed-off-by: Daniel Díaz <[email protected]>
+
+Upstream-Status: Submitted [[email protected]]
+---
+ tests/egl/egl-context-priority.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/tests/egl/egl-context-priority.c b/tests/egl/egl-context-priority.c
+index 7f26fc614..9590ccae3 100644
+--- a/tests/egl/egl-context-priority.c
++++ b/tests/egl/egl-context-priority.c
+@@ -99,8 +99,7 @@ piglit_init(int argc, char **argv)
+ 	if (!strstr(exts, "EGL_MESA_platform_surfaceless"))
+ 		piglit_report_result(PIGLIT_SKIP);
+ 
+-	dpy = eglGetPlatformDisplay(EGL_PLATFORM_SURFACELESS_MESA,
+-				    EGL_DEFAULT_DISPLAY, NULL);
++	dpy = piglit_egl_get_default_display(EGL_PLATFORM_SURFACELESS_MESA);
+ 
+ 	ok = eglInitialize(dpy, &major, &minor);
+ 	if (!ok) {
+-- 
+2.11.0
+
meta/recipes-graphics/piglit/piglit_git.bb +1 -0
index eae3eed342..c6d4e5c6e0 100644
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
 SRC_URI = "git://anongit.freedesktop.org/piglit \
            file://0001-cmake-install-bash-completions-in-the-right-place.patch \
            file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \
+           file://0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch \
            "
 
 # From 2017-02-06
Signature · 1 line
2.11.0
#1 lore raw

✗ patchtest: failure for recipes-graphics/piglit: Add patch for fix build in HiKey platforms

== Series Details ==

Series: recipes-graphics/piglit: Add patch for fix build in HiKey platforms
Revision: 1
URL : https://patchwork.openembedded.org/series/9946/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at 33418ed064)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
#2 lore raw
In reply to Aníbal Limón
Quoted 5 lines · Aníbal Limón

From: Aníbal Limón <[email protected]>

Some EGL implementations do not actually ship all Khronos-extensions. As it turns out, the Mali 450 driver does not include eglGetPlatformDisplay symbol so there is not grauntee to exists use piglit_egl_get_default_display

Anibal,

First, my grammar OCD corrections, :)

s/grauntee/guarantee/

and more generally:
so there is not guarantee ...
so there is no guarantee that it exists,
use piglit_egl_get_default_display

or just use the upstream commit log:
The entry point is not guaranteed to exist, so use the piglit_egl_get_default_display() helper which does the correct thing.

This a backport of 45095dc08b from the piglet git repo so please make that clear in the long log as well.

Thanks,

../Randy

Quoted 68 lines

wrapper instead.

Signed-off-by Aníbal Limón <[email protected]>
Signed-off-by Daniel Díaz <[email protected]>
---
  ...gl-context-priority.c-Use-piglit_egl_get_.patch | 39 ++++++++++++++++++++++
  meta/recipes-graphics/piglit/piglit_git.bb         |  1 +
  2 files changed, 40 insertions(+)

create mode 100644 meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch

meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch new file +39 -0
new file mode 100644
index 0000000000..6b73950fc1
@@ -0,0 +1,39 @@
+From 3b6c3abe3698abb0ae08d14a399eea29805cafd6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <[email protected]>
+Date: Fri, 24 Nov 2017 10:11:42 -0600
+Subject: [PATCH] tests/egl/egl-context-priority.c: Use
+ piglit_egl_get_default_display
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some EGL implementations do not actually ship all Khronos-extensions.
+As it turns out, the Mali 450 driver does not include eglGetPlatformDisplay
+symbol so there is not grauntee to exists use piglit_egl_get_default_display
+wrapper instead. See rev 45095dc08b.
+
+Signed-off-by: Aníbal Limón <[email protected]>
+Signed-off-by: Daniel Díaz <[email protected]>
+
+Upstream-Status: Submitted [[email protected]]
+---
+ tests/egl/egl-context-priority.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/tests/egl/egl-context-priority.c b/tests/egl/egl-context-priority.c
+index 7f26fc614..9590ccae3 100644
+--- a/tests/egl/egl-context-priority.c
++++ b/tests/egl/egl-context-priority.c
+@@ -99,8 +99,7 @@ piglit_init(int argc, char **argv)
+ 	if (!strstr(exts, "EGL_MESA_platform_surfaceless"))
+ 		piglit_report_result(PIGLIT_SKIP);
+
+-	dpy = eglGetPlatformDisplay(EGL_PLATFORM_SURFACELESS_MESA,
+-				    EGL_DEFAULT_DISPLAY, NULL);
++	dpy = piglit_egl_get_default_display(EGL_PLATFORM_SURFACELESS_MESA);
+
+ 	ok = eglInitialize(dpy, &major, &minor);
+ 	if (!ok) {
+--
+2.11.0
+
meta/recipes-graphics/piglit/piglit_git.bb +1 -0
index eae3eed342..c6d4e5c6e0 100644
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
  SRC_URI = "git://anongit.freedesktop.org/piglit \
             file://0001-cmake-install-bash-completions-in-the-right-place.patch \
             file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \
+           file://0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch \
             "
 
  # From 2017-02-06
Signature · 2 lines
# Randy MacLeod.  WR Linux
# Wind River an Intel Company
author
#3 lore raw
Quoted 11 lines · Randy MacLeod
Quoted 8 lines · Aníbal Limón

From: Aníbal Limón <[email protected]>

Some EGL implementations do not actually ship all Khronos-extensions. As it turns out, the Mali 450 driver does not include eglGetPlatformDisplay
symbol so there is not grauntee to exists use piglit_egl_get_default_display

Quoted 6 lines

Anibal,

First, my grammar OCD corrections, :)

s/grauntee/guarantee/

Ok, typo.

Quoted 6 lines

and more generally:
so there is not guarantee ...
so there is no guarantee that it exists,
use piglit_egl_get_default_display

Quoted 9 lines

or just use the upstream commit log:
The entry point is not guaranteed to exist, so use the piglit_egl_get_default_display() helper which does the correct thing.

This a backport of 45095dc08b from the piglet git repo so please make that clear in the long log as well.

This isn't a backport, i will explain better in the commit message.

Cheers,
Anibal

Quoted 95 lines

Thanks,

../Randy

wrapper instead.

Quoted 73 lines
Signed-off-by Aníbal Limón <[email protected]>
Signed-off-by Daniel Díaz <[email protected]>
---
  ...gl-context-priority.c-Use-piglit_egl_get_.patch | 39
++++++++++++++++++++++
  meta/recipes-graphics/piglit/piglit_git.bb         |  1 +
  2 files changed, 40 insertions(+)

create mode 100644 meta/recipes-graphics/piglit/p
iglit/0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch

(quoted diff) +0 -0

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
new file mode 100644
index 0000000000..6b73950fc1

meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl- new file +0 -0

context-priority.c-Use-piglit_egl_get_.patch

meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl- new file +11 -0
@@ -0,0 +1,39 @@
+From 3b6c3abe3698abb0ae08d14a399eea29805cafd6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <[email protected]>
+Date: Fri, 24 Nov 2017 10:11:42 -0600
+Subject: [PATCH] tests/egl/egl-context-priority.c: Use
+ piglit_egl_get_default_display
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some EGL implementations do not actually ship all Khronos-extensions.
+As it turns out, the Mali 450 driver does not include

eglGetPlatformDisplay
+symbol so there is not grauntee to exists use
piglit_egl_get_default_display

meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl- new file +11 -0
+wrapper instead. See rev 45095dc08b.
+
+Signed-off-by: Aníbal Limón <[email protected]>
+Signed-off-by: Daniel Díaz <[email protected]>
+
+Upstream-Status: Submitted [[email protected]]
+---
+ tests/egl/egl-context-priority.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/tests/egl/egl-context-priority.c

b/tests/egl/egl-context-priority.c

meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl- new file +10 -0
+index 7f26fc614..9590ccae3 100644
+--- a/tests/egl/egl-context-priority.c
++++ b/tests/egl/egl-context-priority.c
+@@ -99,8 +99,7 @@ piglit_init(int argc, char **argv)
+       if (!strstr(exts, "EGL_MESA_platform_surfaceless"))
+               piglit_report_result(PIGLIT_SKIP);
+
+-      dpy = eglGetPlatformDisplay(EGL_PLATFORM_SURFACELESS_MESA,
+-                                  EGL_DEFAULT_DISPLAY, NULL);
++      dpy = piglit_egl_get_default_display(EGL_PLATFORM_SURFACELESS_

MESA);

meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl- new file +6 -0
+
+       ok = eglInitialize(dpy, &major, &minor);
+       if (!ok) {
+--
+2.11.0
+
meta/recipes-graphics/piglit/piglit_git.bb +0 -0
index eae3eed342..c6d4e5c6e0 100644
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded710

3a3d8a442a2a0391d607b0"
SRC_URI = "git://anongit.freedesktop.org/piglit \
file://0001-cmake-install-bash-completions-in-the-right-place.patch

Quoted 9 lines
\
             file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch
\
+           file://0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch
\
             "
    # From 2017-02-06

--
# Randy MacLeod. WR Linux
# Wind River an Intel Company