kmscube: Update to master from 2018-06-17

Message ID 1530194188-6052-1-git-send-email-daniel.diaz@linaro.org
State Accepted
Commit 4cc150f31f84d1cbc82df7d7f8fe045a06a9859e
Headers show
Series
  • kmscube: Update to master from 2018-06-17
Related show

Commit Message

Daniel Díaz June 28, 2018, 1:56 p.m.
Changes from 0d8de4ce:
  c2d4ba8 drm-legacy: fix poll for flip event, actually exit on user input
  56c3917 formats: use weston's egl config matching logic, centralize format
  aac3788 Rework default modifier handling
  4f7cec0 Use weak functions to handle lack of gbm modifiers
  98f31bf cube-tex: make use of modifiers
  063ce5c gbm: fix fallback for drivers that don't support modifiers
  9dcce71 add MSAA

Also refresh gbm_bo_map/_unmap patch.

Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
---
 .../detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch      | 10 +++++-----
 meta/recipes-graphics/kmscube/kmscube_git.bb                   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

Comments

Nicolas Dechesne June 29, 2018, 12:16 p.m. | #1
On Thu, Jun 28, 2018 at 3:56 PM Daniel Díaz <daniel.diaz@linaro.org> wrote:
>
> Changes from 0d8de4ce:
>   c2d4ba8 drm-legacy: fix poll for flip event, actually exit on user input
>   56c3917 formats: use weston's egl config matching logic, centralize format
>   aac3788 Rework default modifier handling
>   4f7cec0 Use weak functions to handle lack of gbm modifiers
>   98f31bf cube-tex: make use of modifiers
>   063ce5c gbm: fix fallback for drivers that don't support modifiers
>   9dcce71 add MSAA
>
> Also refresh gbm_bo_map/_unmap patch.
>
> Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>

Thanks for sending this out! without

>   063ce5c gbm: fix fallback for drivers that don't support modifiers

kmscube is broken and won't work with Gallium drivers (e.g. freedreno)
if mesa > 18.x, and since OE-core has mesa 18.1.2, it means kmscube is
currently broken!

Acked-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>

> ---
>  .../detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch      | 10 +++++-----
>  meta/recipes-graphics/kmscube/kmscube_git.bb                   |  2 +-
>  2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch b/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch
> index 3605446..611e541 100644
> --- a/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch
> +++ b/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch
> @@ -49,9 +49,9 @@ diff --git a/configure.ac b/configure.ac
>  index 8397f7b..c7f1f4d 100644
>  --- a/configure.ac
>  +++ b/configure.ac
> -@@ -65,5 +65,8 @@ if test "x$enable_gbm_modifiers" = xyes; then
> -       AC_DEFINE(HAVE_GBM_MODIFIERS, 1, [Define if you can use GBM properties.])
> +@@ -49,5 +49,8 @@ if test "x$HAVE_GST" = "xyes"; then
>   fi
> + AM_CONDITIONAL(ENABLE_GST, [test "x$HAVE_GST" = "xyes"])
>
>  +AC_CHECK_LIB([gbm], [gbm_bo_map], [HAVE_GBM_BO_MAP=yes], [])
>  +AM_CONDITIONAL(ENABLE_GBM_MAP, [test "x$HAVE_GBM_BO_MAP" = "xyes"])
> @@ -99,12 +99,12 @@ diff --git a/kmscube.c b/kmscube.c
>  index 3a2c4dd..276dc55 100644
>  --- a/kmscube.c
>  +++ b/kmscube.c
> -@@ -142,7 +142,11 @@ int main(int argc, char *argv[])
> +@@ -148,7 +148,11 @@ int main(int argc, char *argv[])
>         else if (mode == VIDEO)
> -               egl = init_cube_video(gbm, video);
> +               egl = init_cube_video(gbm, video, samples);
>         else
>  +#if HAVE_GBM_BO_MAP
> -               egl = init_cube_tex(gbm, mode);
> +               egl = init_cube_tex(gbm, mode, samples);
>  +#else
>  +              printf("gbm_bo_map() support missing\n");
>  +#endif
> diff --git a/meta/recipes-graphics/kmscube/kmscube_git.bb b/meta/recipes-graphics/kmscube/kmscube_git.bb
> index 5b64ed6..46aeeb0 100644
> --- a/meta/recipes-graphics/kmscube/kmscube_git.bb
> +++ b/meta/recipes-graphics/kmscube/kmscube_git.bb
> @@ -6,7 +6,7 @@ DEPENDS = "virtual/libgles2 virtual/egl libdrm gstreamer1.0 gstreamer1.0-plugins
>
>  LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb"
>
> -SRCREV = "0d8de4ce3a03f36af1817f9b0586d132ad2c5d2e"
> +SRCREV = "9dcce71e603616ee7a54707e932f962cdf8fb20a"
>  SRC_URI = "git://anongit.freedesktop.org/mesa/kmscube;branch=master;protocol=git \
>      file://detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch"
>  UPSTREAM_CHECK_COMMITS = "1"
> --
> 2.7.4
>

Patch

diff --git a/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch b/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch
index 3605446..611e541 100644
--- a/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch
+++ b/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch
@@ -49,9 +49,9 @@  diff --git a/configure.ac b/configure.ac
 index 8397f7b..c7f1f4d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -65,5 +65,8 @@ if test "x$enable_gbm_modifiers" = xyes; then
- 	AC_DEFINE(HAVE_GBM_MODIFIERS, 1, [Define if you can use GBM properties.])
+@@ -49,5 +49,8 @@ if test "x$HAVE_GST" = "xyes"; then
  fi
+ AM_CONDITIONAL(ENABLE_GST, [test "x$HAVE_GST" = "xyes"])
  
 +AC_CHECK_LIB([gbm], [gbm_bo_map], [HAVE_GBM_BO_MAP=yes], [])
 +AM_CONDITIONAL(ENABLE_GBM_MAP, [test "x$HAVE_GBM_BO_MAP" = "xyes"])
@@ -99,12 +99,12 @@  diff --git a/kmscube.c b/kmscube.c
 index 3a2c4dd..276dc55 100644
 --- a/kmscube.c
 +++ b/kmscube.c
-@@ -142,7 +142,11 @@ int main(int argc, char *argv[])
+@@ -148,7 +148,11 @@ int main(int argc, char *argv[])
  	else if (mode == VIDEO)
- 		egl = init_cube_video(gbm, video);
+ 		egl = init_cube_video(gbm, video, samples);
  	else
 +#if HAVE_GBM_BO_MAP
- 		egl = init_cube_tex(gbm, mode);
+ 		egl = init_cube_tex(gbm, mode, samples);
 +#else
 +		printf("gbm_bo_map() support missing\n");
 +#endif
diff --git a/meta/recipes-graphics/kmscube/kmscube_git.bb b/meta/recipes-graphics/kmscube/kmscube_git.bb
index 5b64ed6..46aeeb0 100644
--- a/meta/recipes-graphics/kmscube/kmscube_git.bb
+++ b/meta/recipes-graphics/kmscube/kmscube_git.bb
@@ -6,7 +6,7 @@  DEPENDS = "virtual/libgles2 virtual/egl libdrm gstreamer1.0 gstreamer1.0-plugins
 
 LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb"
 
-SRCREV = "0d8de4ce3a03f36af1817f9b0586d132ad2c5d2e"
+SRCREV = "9dcce71e603616ee7a54707e932f962cdf8fb20a"
 SRC_URI = "git://anongit.freedesktop.org/mesa/kmscube;branch=master;protocol=git \
     file://detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch"
 UPSTREAM_CHECK_COMMITS = "1"