From f7361bcefeb890fa2f650485b7a3ad6bb2b571e4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 14 Nov 2017 23:07:35 -0800 Subject: [PATCH] userland: Update to latest revision Forward port patches as needed Signed-off-by: Khem Raj --- ...ications-to-set-next-resource-handle.patch | 6 ++-- ...d-Add-support-for-the-Wayland-winsys.patch | 29 +++++++++---------- .../0003-wayland-Add-Wayland-example.patch | 6 ++-- ...and-egl-Add-bcm_host-to-dependencies.patch | 6 ++-- ...-faulty-assert-to-make-weston-happy-.patch | 8 ++--- ...o-out-wl-buffers-in-egl_surface_free.patch | 6 ++-- ...nitialize-front-back-wayland-buffers.patch | 6 ++-- .../userland/0008-Remove-RPC_FLUSH.patch | 6 ++-- .../0009-fix-cmake-dependency-race.patch | 6 ++-- ...or-framerate-with-nested-composition.patch | 6 ++-- ...11-build-shared-library-for-vchostif.patch | 6 ++-- ...ffer-wrapping-interface-for-dispmanx.patch | 6 ++-- ...plement-triple-buffering-for-wayland.patch | 14 ++++----- ...xt.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch | 6 ++-- ...015-EGL-glplatform.h-define-EGL_CAST.patch | 6 ++-- recipes-graphics/userland/userland_git.bb | 2 +- 16 files changed, 62 insertions(+), 63 deletions(-) diff --git a/recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch b/recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch index d622157..5861c4e 100644 --- a/recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch +++ b/recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch @@ -1,7 +1,7 @@ -From f6540119d5b064361ffcb370373794932f97bfdd Mon Sep 17 00:00:00 2001 +From e45bc677368d0f8d42720aad242f33f6e2687fb1 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 9 Jul 2013 09:26:26 -0400 -Subject: [PATCH 01/13] Allow applications to set next resource handle +Subject: [PATCH 01/15] Allow applications to set next resource handle This patch adds provisions in userland to let apps callers set the next rendereing dispmanx resource. @@ -204,5 +204,5 @@ index 8a5734c..51b3580 100644 FN(void, eglIntGetColorData_impl, (EGL_SURFACE_ID_T s, KHRN_IMAGE_FORMAT_T format, uint32_t width, uint32_t height, int32_t stride, uint32_t y_offset, void *data)) -- -2.12.0 +2.15.0 diff --git a/recipes-graphics/userland/userland/0002-wayland-Add-support-for-the-Wayland-winsys.patch b/recipes-graphics/userland/userland/0002-wayland-Add-support-for-the-Wayland-winsys.patch index c054572..d6e6476 100644 --- a/recipes-graphics/userland/userland/0002-wayland-Add-support-for-the-Wayland-winsys.patch +++ b/recipes-graphics/userland/userland/0002-wayland-Add-support-for-the-Wayland-winsys.patch @@ -1,7 +1,7 @@ -From 61a9d792ed774af43e592aa8fdb2a18488696d0f Mon Sep 17 00:00:00 2001 +From 15fb270f438f4ef1413192b5ce1e0dc784b45d9e Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 1 Oct 2013 13:19:20 +0200 -Subject: [PATCH 02/13] wayland: Add support for the Wayland winsys +Subject: [PATCH 02/15] wayland: Add support for the Wayland winsys * Adds EGL_WL_bind_wayland_display extension * Adds wayland-egl library @@ -17,7 +17,7 @@ TODO: wl_dispmanx_server_buffer should probably be defined in a private header that can be included from EGL and vc_* instead of in vc_vchi_dispmanx.h --- - .gitignore | 2 + + .gitignore | 1 + CMakeLists.txt | 11 + README.md | 4 + buildme | 10 +- @@ -47,7 +47,7 @@ vc_vchi_dispmanx.h interface/vmcs_host/vc_vchi_dispmanx.h | 15 ++ interface/wayland/dispmanx.xml | 123 +++++++++++ makefiles/cmake/Wayland.cmake | 72 ++++++ - 30 files changed, 1258 insertions(+), 98 deletions(-) + 30 files changed, 1257 insertions(+), 98 deletions(-) create mode 100644 interface/khronos/common/linux/khrn_wayland.c copy interface/{vmcs_host/vc_vchi_dispmanx.h => khronos/common/linux/khrn_wayland.h} (56%) create mode 100644 interface/khronos/ext/egl_wayland.c @@ -58,14 +58,13 @@ vc_vchi_dispmanx.h create mode 100644 makefiles/cmake/Wayland.cmake diff --git a/.gitignore b/.gitignore -index 4a88665..5da71a9 100644 +index 63570f1..1459436 100644 --- a/.gitignore +++ b/.gitignore -@@ -13,3 +13,5 @@ build/ - *.lai - *.la - *.a -+ +@@ -30,3 +30,4 @@ build/ + *.pts + *.ppm + *.mkv +*~ diff --git a/CMakeLists.txt b/CMakeLists.txt index cfc8ae5..673a5ad 100644 @@ -808,16 +807,16 @@ index b8bb374..03fe67b 100644 /* TODO: do an RPC call to make sure the Khronos vll is loaded (and that it stays loaded until eglTerminate) Also affects global image (and possibly others?) -@@ -451,6 +444,9 @@ EGLAPI const char EGLAPIENTRY * eglQueryString(EGLDisplay dpy, EGLint name) +@@ -450,6 +443,9 @@ EGLAPI const char EGLAPIENTRY * eglQueryString(EGLDisplay dpy, EGLint name) + #ifdef EGL_KHR_fence_sync "EGL_KHR_fence_sync " #endif - #endif ++#endif +#if EGL_WL_bind_wayland_display + "EGL_WL_bind_wayland_display " -+#endif + #endif ; break; - case EGL_VENDOR: @@ -655,8 +651,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig c false, EGL_NO_TEXTURE, @@ -1885,5 +1884,5 @@ index 0000000..ad90d30 + set(${_sources} ${${_sources}} PARENT_SCOPE) +endfunction() -- -2.12.2 +2.15.0 diff --git a/recipes-graphics/userland/userland/0003-wayland-Add-Wayland-example.patch b/recipes-graphics/userland/userland/0003-wayland-Add-Wayland-example.patch index f888533..1d78755 100644 --- a/recipes-graphics/userland/userland/0003-wayland-Add-Wayland-example.patch +++ b/recipes-graphics/userland/userland/0003-wayland-Add-Wayland-example.patch @@ -1,7 +1,7 @@ -From 08679675740d92f022e0fd46207a42589c9f6c51 Mon Sep 17 00:00:00 2001 +From b0437cf318a26c62119ad60649430903f58bbab4 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 1 Oct 2013 13:19:20 +0200 -Subject: [PATCH 03/13] wayland: Add Wayland example +Subject: [PATCH 03/15] wayland: Add Wayland example --- .../linux/apps/hello_pi/CMakeLists.txt | 1 + @@ -862,5 +862,5 @@ index 8225dd5..0be6ce7 100755 - +make -C hello_wayland -- -2.12.0 +2.15.0 diff --git a/recipes-graphics/userland/userland/0004-wayland-egl-Add-bcm_host-to-dependencies.patch b/recipes-graphics/userland/userland/0004-wayland-egl-Add-bcm_host-to-dependencies.patch index f9c0b7b..d60c432 100644 --- a/recipes-graphics/userland/userland/0004-wayland-egl-Add-bcm_host-to-dependencies.patch +++ b/recipes-graphics/userland/userland/0004-wayland-egl-Add-bcm_host-to-dependencies.patch @@ -1,7 +1,7 @@ -From eb9d0eb386b9b3df519a299887b45962c03e732c Mon Sep 17 00:00:00 2001 +From cae4ff834eef23c8f23126ba4d630db395f13aee Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 10 Aug 2015 02:38:27 -0700 -Subject: [PATCH 04/13] wayland-egl: Add bcm_host to dependencies +Subject: [PATCH 04/15] wayland-egl: Add bcm_host to dependencies It uses headers like vcos_platform_types.h but does not depend on module which should add the required include paths @@ -24,5 +24,5 @@ index 8bafc15..fd259c9 100644 Libs: -L${libdir} -lwayland-egl Cflags: -I${includedir} -- -2.12.0 +2.15.0 diff --git a/recipes-graphics/userland/userland/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch b/recipes-graphics/userland/userland/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch index f69bade..676f34c 100644 --- a/recipes-graphics/userland/userland/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch +++ b/recipes-graphics/userland/userland/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch @@ -1,7 +1,7 @@ -From ef3162e061a3231fbf836208f98c38c7c5581a9e Mon Sep 17 00:00:00 2001 +From 8ee4f6eedb81e9bfe0e603a21606c52f9501e609 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 24 Jan 2015 22:07:19 +0100 -Subject: [PATCH 05/13] interface: remove faulty assert() to make weston happy +Subject: [PATCH 05/15] interface: remove faulty assert() to make weston happy at runtime This was removed after a discussion on IRC with the weston guys @@ -13,7 +13,7 @@ Signed-off-by: "Yann E. MORIN" 1 file changed, 1 deletion(-) diff --git a/interface/vmcs_host/vc_vchi_dispmanx.c b/interface/vmcs_host/vc_vchi_dispmanx.c -index 45f4cff..5d0368c 100755 +index eab146e..29e0dee 100755 --- a/interface/vmcs_host/vc_vchi_dispmanx.c +++ b/interface/vmcs_host/vc_vchi_dispmanx.c @@ -1306,7 +1306,6 @@ static void *dispmanx_notify_func( void *arg ) { @@ -25,5 +25,5 @@ index 45f4cff..5d0368c 100755 } } else { -- -2.12.0 +2.15.0 diff --git a/recipes-graphics/userland/userland/0006-zero-out-wl-buffers-in-egl_surface_free.patch b/recipes-graphics/userland/userland/0006-zero-out-wl-buffers-in-egl_surface_free.patch index 196b20b..a8f1f24 100644 --- a/recipes-graphics/userland/userland/0006-zero-out-wl-buffers-in-egl_surface_free.patch +++ b/recipes-graphics/userland/userland/0006-zero-out-wl-buffers-in-egl_surface_free.patch @@ -1,7 +1,7 @@ -From 846e9271cf6a264e7e1f4e33be64df990ff39a74 Mon Sep 17 00:00:00 2001 +From 789b0b0c04b741c21dd573b78eded970721d14c2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 6 Feb 2016 11:10:47 -0800 -Subject: [PATCH 06/13] zero-out wl buffers in egl_surface_free +Subject: [PATCH 06/15] zero-out wl buffers in egl_surface_free origins from buildroot @@ -29,5 +29,5 @@ index 42350bf..1f923d9 100644 #endif } -- -2.12.0 +2.15.0 diff --git a/recipes-graphics/userland/userland/0007-initialize-front-back-wayland-buffers.patch b/recipes-graphics/userland/userland/0007-initialize-front-back-wayland-buffers.patch index 0754921..ad2636a 100644 --- a/recipes-graphics/userland/userland/0007-initialize-front-back-wayland-buffers.patch +++ b/recipes-graphics/userland/userland/0007-initialize-front-back-wayland-buffers.patch @@ -1,7 +1,7 @@ -From 15510fdf1c753c967b509046616b1e1a11b5b772 Mon Sep 17 00:00:00 2001 +From 762dd3156775f167ff0dfd44322dbb19a85822a7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 6 Feb 2016 11:11:41 -0800 -Subject: [PATCH 07/13] initialize front back wayland buffers +Subject: [PATCH 07/15] initialize front back wayland buffers origins from metrological wayland support @@ -30,5 +30,5 @@ index 1f923d9..9a9582c 100644 } #endif -- -2.12.0 +2.15.0 diff --git a/recipes-graphics/userland/userland/0008-Remove-RPC_FLUSH.patch b/recipes-graphics/userland/userland/0008-Remove-RPC_FLUSH.patch index 287e96a..1e66813 100644 --- a/recipes-graphics/userland/userland/0008-Remove-RPC_FLUSH.patch +++ b/recipes-graphics/userland/userland/0008-Remove-RPC_FLUSH.patch @@ -1,7 +1,7 @@ -From 1df080ab9528b82321cf87d71927314294ef7121 Mon Sep 17 00:00:00 2001 +From f8929adbf95ad3d44491cf6fc8a84a686b71193e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 6 Feb 2016 11:09:18 -0800 -Subject: [PATCH 08/13] Remove RPC_FLUSH +Subject: [PATCH 08/15] Remove RPC_FLUSH Origins from buildroot @@ -23,5 +23,5 @@ index f9b7287..b04ffef 100644 } #endif -- -2.12.0 +2.15.0 diff --git a/recipes-graphics/userland/userland/0009-fix-cmake-dependency-race.patch b/recipes-graphics/userland/userland/0009-fix-cmake-dependency-race.patch index 53ccb71..214d5e2 100644 --- a/recipes-graphics/userland/userland/0009-fix-cmake-dependency-race.patch +++ b/recipes-graphics/userland/userland/0009-fix-cmake-dependency-race.patch @@ -1,7 +1,7 @@ -From 11842307cc0e32bac6ef7622e7791ca7a0e9fa61 Mon Sep 17 00:00:00 2001 +From f53e028f33f261f85883c9168977dd5486e9b47c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 6 Feb 2016 13:12:47 -0800 -Subject: [PATCH 09/13] fix cmake dependency race +Subject: [PATCH 09/15] fix cmake dependency race Fixes errors like @@ -74,5 +74,5 @@ index f0bae30..8c44c58 100644 struct wl_resource *resource; struct wl_dispmanx *dispmanx; -- -2.12.0 +2.15.0 diff --git a/recipes-graphics/userland/userland/0010-Fix-for-framerate-with-nested-composition.patch b/recipes-graphics/userland/userland/0010-Fix-for-framerate-with-nested-composition.patch index 80e65d5..9f77920 100644 --- a/recipes-graphics/userland/userland/0010-Fix-for-framerate-with-nested-composition.patch +++ b/recipes-graphics/userland/userland/0010-Fix-for-framerate-with-nested-composition.patch @@ -1,7 +1,7 @@ -From 532dc7dc11877a9dae0f3d101c9bfdacc50840ca Mon Sep 17 00:00:00 2001 +From 6559a57c66c5f55571a1aa29cf14d9130a9ef2c9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 29 Mar 2016 20:38:30 -0700 -Subject: [PATCH 10/13] Fix for framerate with nested composition +Subject: [PATCH 10/15] Fix for framerate with nested composition frame rate appears irregular and lower than expected when using nested composition. @@ -56,5 +56,5 @@ index 03fe67b..13a110c 100644 #ifdef ANDROID CLIENT_UNLOCK(); -- -2.12.0 +2.15.0 diff --git a/recipes-graphics/userland/userland/0011-build-shared-library-for-vchostif.patch b/recipes-graphics/userland/userland/0011-build-shared-library-for-vchostif.patch index 3a35613..5ee5cbd 100644 --- a/recipes-graphics/userland/userland/0011-build-shared-library-for-vchostif.patch +++ b/recipes-graphics/userland/userland/0011-build-shared-library-for-vchostif.patch @@ -1,7 +1,7 @@ -From 37ff90075102407d3abb3899b8c6ef64f6230207 Mon Sep 17 00:00:00 2001 +From 3e396f0b514f3acf90c02f5d55b3816028367a55 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 2 Apr 2016 10:37:24 -0700 -Subject: [PATCH 11/13] build shared library for vchostif +Subject: [PATCH 11/15] build shared library for vchostif Fixes #149 @@ -24,5 +24,5 @@ index c415176..d0cca1a 100755 #add_library(bufman vc_vchi_bufman.c ) -- -2.12.0 +2.15.0 diff --git a/recipes-graphics/userland/userland/0012-implement-buffer-wrapping-interface-for-dispmanx.patch b/recipes-graphics/userland/userland/0012-implement-buffer-wrapping-interface-for-dispmanx.patch index c12876b..48af588 100644 --- a/recipes-graphics/userland/userland/0012-implement-buffer-wrapping-interface-for-dispmanx.patch +++ b/recipes-graphics/userland/userland/0012-implement-buffer-wrapping-interface-for-dispmanx.patch @@ -1,7 +1,7 @@ -From ce130bff946c3b78fc4dbbf98d9b16b5152f2e85 Mon Sep 17 00:00:00 2001 +From f5b2263c8d65e307cb085414e08118cbbe00a94c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 2 Apr 2016 10:54:59 -0700 -Subject: [PATCH 12/13] implement buffer wrapping interface for dispmanx +Subject: [PATCH 12/15] implement buffer wrapping interface for dispmanx Courtesy: Zan Dobersek @@ -88,5 +88,5 @@ index c18626d..11ed1ef 100644 -- -2.12.0 +2.15.0 diff --git a/recipes-graphics/userland/userland/0013-Implement-triple-buffering-for-wayland.patch b/recipes-graphics/userland/userland/0013-Implement-triple-buffering-for-wayland.patch index da50ffd..d3a9840 100644 --- a/recipes-graphics/userland/userland/0013-Implement-triple-buffering-for-wayland.patch +++ b/recipes-graphics/userland/userland/0013-Implement-triple-buffering-for-wayland.patch @@ -1,7 +1,7 @@ -From 14d915a63a4e69290966543ce12edd615bfa9a25 Mon Sep 17 00:00:00 2001 +From 10ba55489002c2ccdf96d221301ec059c4574811 Mon Sep 17 00:00:00 2001 From: Jeff Wannamaker Date: Thu, 19 Jan 2017 18:56:07 +0000 -Subject: [PATCH 13/13] Implement triple buffering for wayland +Subject: [PATCH 13/15] Implement triple buffering for wayland Change from double to triple buffering for wayland. This enables higher frame rates without tearing artifacts @@ -67,10 +67,11 @@ diff --git a/interface/khronos/egl/egl_client_surface.h b/interface/khronos/egl/ index e328b77..58a3184 100644 --- a/interface/khronos/egl/egl_client_surface.h +++ b/interface/khronos/egl/egl_client_surface.h -@@ -313,6 +313,17 @@ typedef struct { +@@ -312,6 +312,17 @@ typedef struct { + */ struct wl_dispmanx_client_buffer *front_wl_buffer; - /* ++ /* + middle_wl_buffer + + Validity: @@ -81,10 +82,9 @@ index e328b77..58a3184 100644 + */ + struct wl_dispmanx_client_buffer *middle_wl_buffer; + -+ /* + /* back_wl_buffer - Validity: -- -2.12.0 +2.15.0 diff --git a/recipes-graphics/userland/userland/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch b/recipes-graphics/userland/userland/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch index 2232d4b..b596056 100644 --- a/recipes-graphics/userland/userland/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch +++ b/recipes-graphics/userland/userland/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch @@ -1,7 +1,7 @@ -From 55a66f56a14eb8c3ae8294860e49efc9c9598c46 Mon Sep 17 00:00:00 2001 +From d750c738b5c23bba24531cb713292e4ab3f2ec56 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 10 May 2017 06:39:34 +0000 -Subject: [PATCH] GLES2/gl2ext.h: Define GL_R8_EXT and GL_RG8_EXT +Subject: [PATCH 14/15] GLES2/gl2ext.h: Define GL_R8_EXT and GL_RG8_EXT weston code uses these defines Upstream-Status: Pending @@ -26,5 +26,5 @@ index 4eacf7f..283e3e1 100644 #ifndef GL_EXT_texture_type_2_10_10_10_REV #define GL_UNSIGNED_INT_2_10_10_10_REV_EXT 0x8368 -- -1.9.1 +2.15.0 diff --git a/recipes-graphics/userland/userland/0015-EGL-glplatform.h-define-EGL_CAST.patch b/recipes-graphics/userland/userland/0015-EGL-glplatform.h-define-EGL_CAST.patch index 5a80a26..f10740b 100644 --- a/recipes-graphics/userland/userland/0015-EGL-glplatform.h-define-EGL_CAST.patch +++ b/recipes-graphics/userland/userland/0015-EGL-glplatform.h-define-EGL_CAST.patch @@ -1,7 +1,7 @@ -From 382e3b16cbcc09d825540d5bd3e45a2fca4484fe Mon Sep 17 00:00:00 2001 +From 827907f2223df93918e680101a1ac6228ba0f07e Mon Sep 17 00:00:00 2001 From: Andrea Galbusera Date: Fri, 14 Jul 2017 09:52:54 +0200 -Subject: [PATCH] EGL/glplatform.h: define EGL_CAST +Subject: [PATCH 15/15] EGL/glplatform.h: define EGL_CAST C++ / C typecast macros for special EGL handle values: used by libepoxy code The definition comes from the updated version of this header in mesa. @@ -28,5 +28,5 @@ index 1f7c930..c39d425 100644 + #endif /* __eglplatform_h */ -- -2.7.4 +2.15.0 diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb index d4624bf..d38b02d 100644 --- a/recipes-graphics/userland/userland_git.bb +++ b/recipes-graphics/userland/userland_git.bb @@ -16,7 +16,7 @@ COMPATIBLE_MACHINE = "^rpi$" SRCBRANCH = "master" SRCFORK = "raspberrypi" -SRCREV = "3caf0cd4a61f46b71eff49422c36e1cd2727ab45" +SRCREV = "bc3c52a51315399a9f31ed24049eb4bc81fd1c60" SRC_URI = "\ git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \