[gtk+] wayland: Uncomment erroneously commented out code
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] wayland: Uncomment erroneously commented out code
- Date: Tue, 6 Dec 2016 16:53:53 +0000 (UTC)
commit a85a97c1a117bcedf3685337a3fe69fac9bdcb6a
Author: Benjamin Otte <otte redhat com>
Date: Tue Dec 6 17:51:35 2016 +0100
wayland: Uncomment erroneously commented out code
I read the code as if (use_gl) instead of if (!use_gl) and commented it
out in bddfd7bb41cebd9b4e8ea418ce4d8e1f11822e81. That broke drawing on
Wayland without OpenGL completely.
Whoops.
Now it's back.
gdk/wayland/gdkwindow-wayland.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 603a027..ec11234 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -882,14 +882,12 @@ gdk_window_impl_wayland_begin_paint (GdkWindow *window)
static void
gdk_window_impl_wayland_end_paint (GdkWindow *window)
{
-#if 0
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
cairo_rectangle_int_t rect;
int i, n;
if (impl->staging_cairo_surface &&
_gdk_wayland_is_shm_surface (impl->staging_cairo_surface) &&
- !window->current_paint.use_gl &&
!cairo_region_is_empty (window->current_paint.region))
{
gdk_wayland_window_attach_image (window);
@@ -921,7 +919,6 @@ gdk_window_impl_wayland_end_paint (GdkWindow *window)
impl->pending_commit = TRUE;
}
-#endif
gdk_wayland_window_sync_margin (window);
gdk_wayland_window_sync_opaque_region (window);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]