gtk%2B/gtk%2B3/opengl.patch

21  docs/tools/widgets.c             |  6 +++++-
25  gdk/gdkglcontext.c               |  6 ++++++
28  gdk/x11/gdkdisplay-x11.c         |  6 +++++-
35  gtk/inspector/general.c          |  6 ++++++
42 diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
44 --- a/demos/gtk-demo/meson.build
46 @@ -28,7 +28,6 @@ demos = files([
54 @@ -87,6 +86,10 @@ elif harfbuzz_dep.found() and pangoft_dep.found()
65 diff --git a/docs/tools/meson.build b/docs/tools/meson.build
67 --- a/docs/tools/meson.build
85 diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
87 --- a/docs/tools/widgets.c
112 diff --git a/gdk/gdkconfig.h.meson b/gdk/gdkconfig.h.meson
114 --- a/gdk/gdkconfig.h.meson
116 @@ -15,6 +15,7 @@ G_BEGIN_DECLS
124 diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
126 --- a/gdk/gdkdisplay.c
140 diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c
142 --- a/gdk/gdkgl.c
155 @@ -36,6 +37,7 @@ gdk_cairo_surface_mark_as_direct (cairo_surface_t *surface,
163 @@ -208,6 +210,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data)
171 @@ -216,6 +219,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context,
179 @@ -289,6 +293,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context,
186  /* x,y,width,height describes a rectangle in the gl render buffer
187 @@ -337,6 +342,7 @@ gdk_cairo_draw_from_gl (cairo_t              *cr,
195 @@ -727,6 +733,7 @@ out:
203 @@ -734,6 +741,7 @@ void
217 diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
219 --- a/gdk/gdkglcontext.c
231 @@ -246,6 +248,7 @@ gdk_gl_context_upload_texture (GdkGLContext    *context,
239 @@ -289,6 +292,7 @@ gdk_gl_context_upload_texture (GdkGLContext    *context,
247 @@ -801,6 +805,7 @@ gdk_gl_context_realize (GdkGLContext  *context,
255 @@ -888,6 +893,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
263 diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
265 --- a/gdk/gdkwindow.c
277 @@ -2844,6 +2846,13 @@ gdk_window_get_paint_gl_context (GdkWindow  *window,
291 @@ -2979,6 +2988,7 @@ gdk_window_begin_paint_internal (GdkWindow            *window,
297            /* With gl we always need a surface to combine the gl
299 @@ -2993,6 +3003,7 @@ gdk_window_begin_paint_internal (GdkWindow            *window,
307 @@ -3056,6 +3067,7 @@ gdk_window_end_paint_internal (GdkWindow *window)
315 @@ -3066,6 +3078,7 @@ gdk_window_end_paint_internal (GdkWindow *window)
323 diff --git a/gdk/meson.build b/gdk/meson.build
325 --- a/gdk/meson.build
327 @@ -56,7 +56,6 @@ gdk_gir_public_headers = files(
335 @@ -78,6 +77,12 @@ gdk_gir_public_headers = files(
348 @@ -166,6 +171,7 @@ gdkconfig_cdata.set('GDK_WINDOWING_WAYLAND', wayland_enabled)
356 diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
358 --- a/gdk/x11/gdkdisplay-x11.c
381 diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
383 --- a/gdk/x11/gdkvisual-x11.c
398 diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
400 --- a/gdk/x11/gdkwindow-x11.c
422 diff --git a/gdk/x11/gdkx-autocleanups.h b/gdk/x11/gdkx-autocleanups.h
424 --- a/gdk/x11/gdkx-autocleanups.h
436 diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
438 --- a/gdk/x11/gdkx.h
450 diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build
452 --- a/gdk/x11/meson.build
454 @@ -14,7 +14,6 @@ gdk_x11_sources = files(
462 @@ -42,7 +41,6 @@ gdk_x11_public_headers = files(
470 @@ -53,6 +51,11 @@ gdk_x11_public_headers = files(
482 diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c
484 --- a/gtk/gtkglarea.c
509 @@ -483,6 +488,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area)
517 @@ -501,6 +507,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area)
539 @@ -569,6 +578,7 @@ gtk_gl_area_delete_buffers (GtkGLArea *area)
547 @@ -679,6 +689,7 @@ gtk_gl_area_draw (GtkWidget *widget,
555 @@ -736,6 +747,14 @@ gtk_gl_area_draw (GtkWidget *widget,
570 diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
572 --- a/gtk/inspector/general.c
585 @@ -221,6 +223,7 @@ add_label_row (GtkInspectorGeneral *gen,
593 @@ -230,6 +233,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen,
601 @@ -279,6 +283,7 @@ wayland_get_display (struct wl_display *wl_display)
609 @@ -305,6 +310,7 @@ init_gl (GtkInspectorGeneral *gen)
617 diff --git a/meson.build b/meson.build
619 --- a/meson.build
621 @@ -137,6 +137,7 @@ wayland_enabled        = get_option('wayland_backend')
638 @@ -476,6 +477,10 @@ if tracker3_enabled
675 diff --git a/meson_options.txt b/meson_options.txt
677 --- a/meson_options.txt
679 @@ -19,6 +19,8 @@ option('profiler', type: 'boolean', value: false,
688 diff --git a/tests/meson.build b/tests/meson.build
689 index 6ff249f..f2a9fba 100644
690 --- a/tests/meson.build
692 @@ -5,7 +5,6 @@ gtk_tests = [
700 @@ -55,7 +54,6 @@ gtk_tests = [
708 @@ -138,6 +136,13 @@ if x11_enabled
722 diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c
724 --- a/testsuite/gtk/objects-finalize.c
734  	  /* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */