From 9ed0c42eb618229fa6f45e10155ee535e1f605a2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 20 Oct 2022 01:59:18 +0100 Subject: gentoo auto-resync : 20:10:2022 - 01:59:18 --- gui-libs/wlroots/Manifest | 1 - gui-libs/wlroots/files/0.15.0-59b9518f.patch | 88 ---------------------------- 2 files changed, 89 deletions(-) delete mode 100644 gui-libs/wlroots/files/0.15.0-59b9518f.patch (limited to 'gui-libs/wlroots') diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest index 70e897a3f387..39e9335b3702 100644 --- a/gui-libs/wlroots/Manifest +++ b/gui-libs/wlroots/Manifest @@ -1,4 +1,3 @@ -AUX 0.15.0-59b9518f.patch 3473 BLAKE2B a90910cb8be97f3c030afb3fcab3613fcff29acdface938165b33801a5e72366b1bdd77210262ba0eb803a489f8947b36d5a875fbf8fe20c9e8dd100b4637f9d SHA512 252ff3eb1ae8ad6d06d52e69f3703dbd98abd3491f2871d2f00f72b05e48ada78ffe8bad84a0e3df5e708d2e5a41cd75b5fca2f99378bf57e5a12439519d6a88 AUX wlroots-0.15.1-tinywl-dont-crash-upon-missing-keyboard.patch 2877 BLAKE2B ff492af5cf7b5c866e49ce1bf78286c57e54eb4d3a6c60d4b1087a796b081618b6fe87afc4efd79aec5b4b3ecdb749027cfc74f09500211a086550a5db9d70d6 SHA512 52a6cf0bd22a514adf427d9f02768f5ecc24d1c83cecd51eda89938bdd79dee50e11103ae9fa2ededfcacb5a485415453308026c68fe1e3ffdb447503696535d DIST wlroots-0.14.0.tar.gz 505461 BLAKE2B d2fa28f64014ef9d840838cb5938af23f6f6b211b62dc352d0d5bb824ccaa7d7a85531e1eca14feeb06d31d59955ff9a913e40a73cad21ed1ebfe76ada39d558 SHA512 83f001133cb4b11a72bb9532b7321655428826662848f67de8e3220a33d9dff4d37c859602bdc319929949d387d014a257b0347039a6649944d7b084c76bb611 DIST wlroots-0.14.1.tar.gz 505840 BLAKE2B fca4d259cdde62da0c196344ce1d0f5dd679d012ff33e3ceb5385b9374667e16d91059a2ba6a318153e79ac2f0a6464e3066e614a13398f8c433f442560d84d2 SHA512 4f557c827f9673eccf208a3644954de80e7355b95cc374cc5e851a47087b227f196e0936c0913d21a6c776c29b74de2d028a100931264e41934c747568d8ebe0 diff --git a/gui-libs/wlroots/files/0.15.0-59b9518f.patch b/gui-libs/wlroots/files/0.15.0-59b9518f.patch deleted file mode 100644 index 95ca0becd618..000000000000 --- a/gui-libs/wlroots/files/0.15.0-59b9518f.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 59b9518f072527ac59593e51df7f5d5331a34f0e Mon Sep 17 00:00:00 2001 -From: Thomas Hebb -Date: Wed, 5 Jan 2022 00:16:59 -0800 -Subject: [PATCH] render/gles2: don't constrain shm formats to ones that - support reading - -commit 44e8451cd93e ("render/gles2: hide shm formats without GL -support") added the is_gles2_pixel_format_supported() function to -render/gles2/pixel_format.c, whose stated purpose is to "check whether -the renderer has the needed GL extensions to read a given pixel format." -It then used that function to filter the pixel formats returned by -get_gles2_shm_formats(). - -The result of this change is that RGB formats are no longer reported for -GL drivers that don't implement EXT_read_format_bgra, even when those -formats are supported for rendering (which they have to be for -wlr_gles2_renderer_create() to succeed). This is a pretty clear -regression, since wlr_renderer_init_wl_shm() fails when either of -WL_SHM_FORMAT_ARGB8888 or WL_SHM_FORMAT_XRGB8888 are missing. - -To fix the regression, change is_gles2_pixel_format_supported() to -accept all pixel formats that support rendering, regardless of whether -we can read them or not, and move the check for EXT_read_format_bgra -back into gles2_read_pixels(). (There's already a check for this -extension in gles2_preferred_read_format(), so we're not breaking any -abstraction that wasn't already broken.) - -Tested on the NVIDIA 495.46 proprietary driver, which doesn't support -EXT_read_format_bgra. - -Fixes: 44e8451cd93e ("render/gles2: hide shm formats without GL support") ---- - render/gles2/pixel_format.c | 14 ++++++++++---- - render/gles2/renderer.c | 6 ++++++ - 2 files changed, 16 insertions(+), 4 deletions(-) - -diff --git a/render/gles2/pixel_format.c b/render/gles2/pixel_format.c -index 31bb3908..b155bbbe 100644 ---- a/render/gles2/pixel_format.c -+++ b/render/gles2/pixel_format.c -@@ -98,6 +98,10 @@ static const struct wlr_gles2_pixel_format formats[] = { - - // TODO: more pixel formats - -+/* -+ * Return true if supported for texturing, even if other operations like -+ * reading aren't supported. -+ */ - bool is_gles2_pixel_format_supported(const struct wlr_gles2_renderer *renderer, - const struct wlr_gles2_pixel_format *format) { - if (format->gl_type == GL_UNSIGNED_INT_2_10_10_10_REV_EXT -@@ -108,10 +112,12 @@ bool is_gles2_pixel_format_supported(const struct wlr_gles2_renderer *renderer, - && !renderer->exts.OES_texture_half_float_linear) { - return false; - } -- if (format->gl_format == GL_BGRA_EXT -- && !renderer->exts.EXT_read_format_bgra) { -- return false; -- } -+ /* -+ * Note that we don't need to check for GL_EXT_texture_format_BGRA8888 -+ * here, since we've already checked if we have it at renderer creation -+ * time and bailed out if not. We do the check there because Wayland -+ * requires all compositors to support SHM buffers in that format. -+ */ - return true; - } - -diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c -index 527d85bf..67b8ead4 100644 ---- a/render/gles2/renderer.c -+++ b/render/gles2/renderer.c -@@ -441,6 +441,12 @@ static bool gles2_read_pixels(struct wlr_renderer *wlr_renderer, - return false; - } - -+ if (fmt->gl_format == GL_BGRA_EXT && !renderer->exts.EXT_read_format_bgra) { -+ wlr_log(WLR_ERROR, -+ "Cannot read pixels: missing GL_EXT_read_format_bgra extension"); -+ return false; -+ } -+ - const struct wlr_pixel_format_info *drm_fmt = - drm_get_pixel_format_info(fmt->drm_format); - assert(drm_fmt); --- -GitLab - -- cgit v1.2.3