PktSurf
9d657e0a1d
Renamed .SMBuild files to smbuild for simplicity Added musl-fts, musl-obstack, glslang, python-glad, libptytty, libmilter, elfutils and fuse to base section build list Discarded fuse2 and fuse3 from base section Temporarily discarded slapt-get, syslinux, p7zip, acpid, libelf-compat, gnu-eif, libtirpc, mozilla-nss, lua53, qpdf, kernel-source and signify from base section build list Disabled nls and made amends to base/e2fsprogs Upgraded base/git to 2.46.2 Upgraded extra/gnumeric to 1.12.57 Disabled nls in base/gnutls, extra/dia Disabled a patch and made amends in base/llvm Fixed configure.local file in base/mandoc Upgraded base/rust to 1.79 Fixed a ton of build files to use build prefix as /usr and miscellaneous changes Discarded extra/bluez,blueman,scrcpy,adafruit-io Added tomb to extra Added new build option to extra/libass Upgraded extra/mpv to 0.37.0 Disabled tests in gtk/gdk-pixbuf Upgraded gtk/goffice to 0.10.57 Added gtk-doc to gtk section Fixed build options in gtk/gtk2 Added new patches to gtk/gtk3 Added gtksourceview to gtk section Added vulkan-headers to xorg section Upgraded xorg/mesa to 23.1.9 Added libplacebo to xorg section Fixed build stuff in xorg/glew
72 lines
3 KiB
Diff
72 lines
3 KiB
Diff
Patch-Source: https://gitlab.gnome.org/GNOME/gtk/-/commit/7237f5d0eb5ec2f1411a28b9394ff4c4472f4d8b
|
|
https://gitlab.gnome.org/GNOME/gtk/-/issues/4704
|
|
--
|
|
From 7237f5d0eb5ec2f1411a28b9394ff4c4472f4d8b Mon Sep 17 00:00:00 2001
|
|
From: henry <henry.riehl@btinternet.com>
|
|
Date: Wed, 31 May 2023 23:05:19 +0100
|
|
Subject: [PATCH] This commit fixes a performance issue on X11 systems in
|
|
regards to drawing on an OpenGL surface in GTK/GDK.
|
|
|
|
This commit fixes a performance issue on X11 systems making use of the gdk_cairo_draw_from_gl() function in regards
|
|
to drawing on an OpenGL surface in GTK/GDK. Specifically, this fix removes the slow X11 codepath that was used when
|
|
executing the gdk_cairo_draw_from_gl() function because it was completely uneeded. I tested the before and after on
|
|
Flutter and GTK apps making use of the OpenGL rendering and can confirm that there is no behaviour and visual
|
|
difference. This change is also specific to drawings that make use of textures. The render buffer code path has
|
|
been left completely unmodified.
|
|
|
|
Closes #4704
|
|
---
|
|
gdk/gdkgl.c | 30 +-----------------------------
|
|
1 file changed, 1 insertion(+), 29 deletions(-)
|
|
|
|
diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c
|
|
index 666b5e81335..86b169039a8 100644
|
|
--- a/gdk/gdkgl.c
|
|
+++ b/gdk/gdkgl.c
|
|
@@ -392,11 +392,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr,
|
|
else if (source_type == GL_TEXTURE)
|
|
{
|
|
glBindTexture (GL_TEXTURE_2D, source);
|
|
-
|
|
- if (gdk_gl_context_get_use_es (paint_context))
|
|
- alpha_size = 1;
|
|
- else
|
|
- glGetTexLevelParameteriv (GL_TEXTURE_2D, 0, GL_TEXTURE_ALPHA_SIZE, &alpha_size);
|
|
+ glGetTexLevelParameteriv (GL_TEXTURE_2D, 0, GL_TEXTURE_ALPHA_SIZE, &alpha_size);
|
|
}
|
|
else
|
|
{
|
|
@@ -540,30 +536,6 @@ gdk_cairo_draw_from_gl (cairo_t *cr,
|
|
/* Translate to impl coords */
|
|
cairo_region_translate (clip_region, dx, dy);
|
|
|
|
- if (alpha_size != 0)
|
|
- {
|
|
- cairo_region_t *opaque_region, *blend_region;
|
|
-
|
|
- opaque_region = cairo_region_copy (clip_region);
|
|
- cairo_region_subtract (opaque_region, impl_window->current_paint.flushed_region);
|
|
- cairo_region_subtract (opaque_region, impl_window->current_paint.need_blend_region);
|
|
-
|
|
- if (!cairo_region_is_empty (opaque_region))
|
|
- gdk_gl_texture_from_surface (impl_window->current_paint.surface,
|
|
- opaque_region);
|
|
-
|
|
- blend_region = cairo_region_copy (clip_region);
|
|
- cairo_region_intersect (blend_region, impl_window->current_paint.need_blend_region);
|
|
-
|
|
- glEnable (GL_BLEND);
|
|
- if (!cairo_region_is_empty (blend_region))
|
|
- gdk_gl_texture_from_surface (impl_window->current_paint.surface,
|
|
- blend_region);
|
|
-
|
|
- cairo_region_destroy (opaque_region);
|
|
- cairo_region_destroy (blend_region);
|
|
- }
|
|
-
|
|
glBindTexture (GL_TEXTURE_2D, source);
|
|
|
|
if (gdk_gl_context_get_use_es (paint_context))
|
|
--
|
|
GitLab
|
|
|