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

Message ID 20171124165203.11759-1-limon.anibal@gmail.com
State New
Headers show
Series
  • recipes-graphics/piglit: Add patch for fix build in HiKey platforms
Related show

Commit Message

Aníbal Limón Nov. 24, 2017, 4:52 p.m.
From: Aníbal Limón <anibal.limon@linaro.org>

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 <anibal.limon@linaro.org>
Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
---
 ...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

Comments

Randy MacLeod Nov. 27, 2017, 11:06 p.m. | #1
On 2017-11-24 11:52 AM, Aníbal Limón wrote:
> From: Aníbal Limón <anibal.limon@linaro.org>
> 
> 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


> wrapper instead.
> 
> Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
> Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
> ---
>   ...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
> 
> 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
> new file mode 100644
> index 0000000000..6b73950fc1
> --- /dev/null
> +++ b/meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch
> @@ -0,0 +1,39 @@
> +From 3b6c3abe3698abb0ae08d14a399eea29805cafd6 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linaro.org>
> +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 <anibal.limon@linaro.org>
> +Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
> +
> +Upstream-Status: Submitted [piglit@lists.freedesktop.org]
> +---
> + 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
> +
> diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
> index eae3eed342..c6d4e5c6e0 100644
> --- a/meta/recipes-graphics/piglit/piglit_git.bb
> +++ b/meta/recipes-graphics/piglit/piglit_git.bb
> @@ -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
>
Aníbal Limón Nov. 27, 2017, 11:14 p.m. | #2
On Mon, Nov 27, 2017 at 5:06 PM, Randy MacLeod <randy.macleod@windriver.com>
wrote:

> On 2017-11-24 11:52 AM, Aníbal Limón wrote:

>

>> From: Aníbal Limón <anibal.limon@linaro.org>

>>

>> 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/

>


Ok, typo.


>

> 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.

>


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

Cheers,
Anibal



>

> Thanks,

>

> ../Randy

>

>

>

> wrapper instead.

>>

>> Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>

>> Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>

>> ---

>>   ...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

>>

>> 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

>> new file mode 100644

>> index 0000000000..6b73950fc1

>> --- /dev/null

>> +++ b/meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl-

>> context-priority.c-Use-piglit_egl_get_.patch

>> @@ -0,0 +1,39 @@

>> +From 3b6c3abe3698abb0ae08d14a399eea29805cafd6 Mon Sep 17 00:00:00 2001

>> +From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linaro.org>

>> +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 <anibal.limon@linaro.org>

>> +Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>

>> +

>> +Upstream-Status: Submitted [piglit@lists.freedesktop.org]

>> +---

>> + 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

>> +

>> diff --git a/meta/recipes-graphics/piglit/piglit_git.bb

>> b/meta/recipes-graphics/piglit/piglit_git.bb

>> index eae3eed342..c6d4e5c6e0 100644

>> --- a/meta/recipes-graphics/piglit/piglit_git.bb

>> +++ b/meta/recipes-graphics/piglit/piglit_git.bb

>> @@ -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

>> \

>>              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

>
<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Nov 27, 2017 at 5:06 PM, Randy MacLeod <span dir="ltr">&lt;<a href="mailto:randy.macleod@windriver.com" target="_blank">randy.macleod@windriver.com</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On 2017-11-24 11:52 AM, Aníbal Limón wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
From: Aníbal Limón &lt;<a href="mailto:anibal.limon@linaro.org" target="_blank">anibal.limon@linaro.org</a>&gt;<br>

<br>
Some EGL implementations do not actually ship all Khronos-extensions.<br>
As it turns out, the Mali 450 driver does not include eglGetPlatformDisplay<br>
symbol so there is not grauntee to exists use piglit_egl_get_default_display<br>
</blockquote>
<br></span>
Anibal,<br>
<br>
First, my grammar OCD corrections,   :)<br>
<br>
s/grauntee/guarantee/<br></blockquote><div><br></div><div>Ok, typo.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
and more generally:<br>
  so there is not guarantee ...<br>
  so there is no guarantee that it exists,<br>
     use piglit_egl_get_default_display<br>
<br>
or just use the upstream commit log:<br>
    The entry point is not guaranteed to exist, so use the<br>
    piglit_egl_get_default_display<wbr>() helper which does the<br>
    correct thing.<br>
<br>
<br>
This a backport of 45095dc08b from the piglet git repo<br>
so please make that clear in the long log as well.<br></blockquote><div><br></div><div>This isn&#39;t a backport, i will explain better in the commit message.</div><div><br></div><div>Cheers,</div><div>Anibal</div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Thanks,<br>
<br>
../Randy<div><div class="h5"><br>
<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
wrapper instead.<br>
<br>
Signed-off-by: Aníbal Limón &lt;<a href="mailto:anibal.limon@linaro.org" target="_blank">anibal.limon@linaro.org</a>&gt;<br>

Signed-off-by: Daniel Díaz &lt;<a href="mailto:daniel.diaz@linaro.org" target="_blank">daniel.diaz@linaro.org</a>&gt;<br>

---<br>
  ...gl-context-priority.c-Use-p<wbr>iglit_egl_get_.patch | 39 ++++++++++++++++++++++<br>
  meta/recipes-graphics/piglit/<a href="http://piglit_git.bb" rel="noreferrer" target="_blank">p<wbr>iglit_git.bb</a>         |  1 +<br>
  2 files changed, 40 insertions(+)<br>
  create mode 100644 meta/recipes-graphics/piglit/p<wbr>iglit/0001-tests-egl-egl-conte<wbr>xt-priority.c-Use-piglit_egl_<wbr>get_.patch<br>
<br>
diff --git a/meta/recipes-graphics/piglit<wbr>/piglit/0001-tests-egl-egl-<wbr>context-priority.c-Use-piglit_<wbr>egl_get_.patch b/meta/recipes-graphics/piglit<wbr>/piglit/0001-tests-egl-egl-<wbr>context-priority.c-Use-piglit_<wbr>egl_get_.patch<br>
new file mode 100644<br>
index 0000000000..6b73950fc1<br>
--- /dev/null<br>
+++ b/meta/recipes-graphics/piglit<wbr>/piglit/0001-tests-egl-egl-<wbr>context-priority.c-Use-piglit_<wbr>egl_get_.patch<br>
@@ -0,0 +1,39 @@<br>
+From 3b6c3abe3698abb0ae08d14a399eea<wbr>29805cafd6 Mon Sep 17 00:00:00 2001<br>
+From: =?UTF-8?q?An=C3=ADbal=20Lim=C3<wbr>=B3n?= &lt;<a href="mailto:anibal.limon@linaro.org" target="_blank">anibal.limon@linaro.org</a>&gt;<br>
+Date: Fri, 24 Nov 2017 10:11:42 -0600<br>
+Subject: [PATCH] tests/egl/egl-context-priority<wbr>.c: Use<br>
+ piglit_egl_get_default_display<br>
+MIME-Version: 1.0<br>
+Content-Type: text/plain; charset=UTF-8<br>
+Content-Transfer-Encoding: 8bit<br>
+<br>
+Some EGL implementations do not actually ship all Khronos-extensions.<br>
+As it turns out, the Mali 450 driver does not include eglGetPlatformDisplay<br>
+symbol so there is not grauntee to exists use piglit_egl_get_default_display<br>
+wrapper instead. See rev 45095dc08b.<br>
+<br>
+Signed-off-by: Aníbal Limón &lt;<a href="mailto:anibal.limon@linaro.org" target="_blank">anibal.limon@linaro.org</a>&gt;<br>
+Signed-off-by: Daniel Díaz &lt;<a href="mailto:daniel.diaz@linaro.org" target="_blank">daniel.diaz@linaro.org</a>&gt;<br>
+<br>
+Upstream-Status: Submitted [<a href="mailto:piglit@lists.freedesktop.org" target="_blank">piglit@lists.freedesktop.org</a>]<br>
+---<br>
+ tests/egl/egl-context-priority<wbr>.c | 3 +--<br>
+ 1 file changed, 1 insertion(+), 2 deletions(-)<br>
+<br>
+diff --git a/tests/egl/egl-context-priori<wbr>ty.c b/tests/egl/egl-context-priori<wbr>ty.c<br>
+index 7f26fc614..9590ccae3 100644<br>
+--- a/tests/egl/egl-context-priori<wbr>ty.c<br>
++++ b/tests/egl/egl-context-priori<wbr>ty.c<br>
+@@ -99,8 +99,7 @@ piglit_init(int argc, char **argv)<br>
+       if (!strstr(exts, &quot;EGL_MESA_platform_surfaceless<wbr>&quot;))<br>
+               piglit_report_result(PIGLIT_S<wbr>KIP);<br>
+<br>
+-      dpy = eglGetPlatformDisplay(EGL_PLAT<wbr>FORM_SURFACELESS_MESA,<br>
+-                                  EGL_DEFAULT_DISPLAY, NULL);<br>
++      dpy = piglit_egl_get_default_display<wbr>(EGL_PLATFORM_SURFACELESS_<wbr>MESA);<br>
+<br>
+       ok = eglInitialize(dpy, &amp;major, &amp;minor);<br>
+       if (!ok) {<br>
+--<br>
+2.11.0<br>
+<br>
diff --git a/meta/recipes-graphics/piglit<wbr>/<a href="http://piglit_git.bb" rel="noreferrer" target="_blank">piglit_git.bb</a> b/meta/recipes-graphics/piglit<wbr>/<a href="http://piglit_git.bb" rel="noreferrer" target="_blank">piglit_git.bb</a><br>
index eae3eed342..c6d4e5c6e0 100644<br>
--- a/meta/recipes-graphics/piglit<wbr>/<a href="http://piglit_git.bb" rel="noreferrer" target="_blank">piglit_git.bb</a><br>
+++ b/meta/recipes-graphics/piglit<wbr>/<a href="http://piglit_git.bb" rel="noreferrer" target="_blank">piglit_git.bb</a><br>
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = &quot;file://COPYING;md5=b2beded710<wbr>3a3d8a442a2a0391d607b0&quot;<br>
  SRC_URI = &quot;git://<a href="http://anongit.freedesktop.org/piglit" rel="noreferrer" target="_blank">anongit.freedesktop.org<wbr>/piglit</a> \<br>
             file://0001-cmake-install-bas<wbr>h-completions-in-the-right-pla<wbr>ce.patch \<br>
             file://0001-tests-Use-FE_UPWA<wbr>RD-only-if-its-defined-in-fenv<wbr>.h.patch \<br>
+           file://0001-tests-egl-egl-con<wbr>text-priority.c-Use-piglit_egl<wbr>_get_.patch \<br>
             &quot;<br>
    # From 2017-02-06<br>
<br>
</blockquote>
<br>
<br>
-- <br></div></div>
# Randy MacLeod.  WR Linux<br>
# Wind River an Intel Company<br>
</blockquote></div><br></div></div>
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

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
new file mode 100644
index 0000000000..6b73950fc1
--- /dev/null
+++ b/meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch
@@ -0,0 +1,39 @@ 
+From 3b6c3abe3698abb0ae08d14a399eea29805cafd6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linaro.org>
+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 <anibal.limon@linaro.org>
+Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
+
+Upstream-Status: Submitted [piglit@lists.freedesktop.org]
+---
+ 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
+
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index eae3eed342..c6d4e5c6e0 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -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