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

21  docs/tools/widgets.c             |  6 +++++-
23  gdk/gdkdisplay.c                 |  4 ++++
24  gdk/gdkgl.c                      | 11 ++++++++++-
25  gdk/gdkglcontext.c               |  6 ++++++
26  gdk/gdkwindow.c                  | 13 +++++++++++++
28  gdk/x11/gdkdisplay-x11.c         |  6 +++++-
29  gdk/x11/gdkvisual-x11.c          |  5 +++++
30  gdk/x11/gdkwindow-x11.c          |  4 ++++
34  gtk/gtkglarea.c                  | 19 +++++++++++++++++++
35  gtk/inspector/general.c          |  6 ++++++
39  testsuite/gtk/objects-finalize.c |  2 ++
46 @@ -28,7 +28,6 @@ demos = files([
47    'fishbowl.c',
48    'foreigndrawing.c',
49    'gestures.c',
50 -  'glarea.c',
51    'headerbar.c',
52    'hypertext.c',
53    'iconview.c',
54 @@ -87,6 +86,10 @@ elif harfbuzz_dep.found() and pangoft_dep.found()
59 +  demos += files('glarea.c')
63    demos += files('pagesetup.c')
71      'shadow.c',
72      'shooter.c',
73 -    'widgets.c',
74 -    '../../tests/gtkgears.c',
75 +    'widgets.c'
79 +  doc_shooter_sources += ['../../tests/gtkgears.c']
85 diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
87 --- a/docs/tools/widgets.c
88 +++ b/docs/tools/widgets.c
116 @@ -15,6 +15,7 @@ G_BEGIN_DECLS
124 diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
126 --- a/gdk/gdkdisplay.c
127 +++ b/gdk/gdkdisplay.c
140 diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c
142 --- a/gdk/gdkgl.c
143 +++ b/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,
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
220 +++ b/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
266 +++ b/gdk/gdkwindow.c
276  #include "fallback-c89.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,
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)
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
359 +++ b/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
384 +++ b/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
401 +++ b/gdk/x11/gdkwindow-x11.c
454 @@ -14,7 +14,6 @@ gdk_x11_sources = files(
455    'gdkeventsource.c',
456    'gdkeventtranslator.c',
457    'gdkgeometry-x11.c',
458 -  'gdkglcontext-x11.c',
459    'gdkkeys-x11.c',
460    'gdkmain-x11.c',
461    'gdkproperty-x11.c',
462 @@ -42,7 +41,6 @@ gdk_x11_public_headers = files(
470 @@ -53,6 +51,11 @@ gdk_x11_public_headers = files(
475 +  gdk_x11_sources += files('gdkglcontext-x11.c')
482 diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c
484 --- a/gtk/gtkglarea.c
485 +++ b/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
573 +++ b/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)
621 @@ -137,6 +137,7 @@ wayland_enabled        = get_option('wayland_backend')
638 @@ -476,6 +477,10 @@ if tracker3_enabled
679 @@ -19,6 +19,8 @@ option('profiler', type: 'boolean', value: false,
689 index 6ff249f..f2a9fba 100644
692 @@ -5,7 +5,6 @@ gtk_tests = [
693    ['scrolling-performance', ['frame-stats.c', 'variable.c']],
694    ['blur-performance', ['../gtk/gtkcairoblur.c']],
696 -  ['gdkgears', ['gtkgears.c']],
700 @@ -55,7 +54,6 @@ gtk_tests = [
704 -  ['testglblending', ['gtkgears.c']],
708 @@ -138,6 +136,13 @@ if x11_enabled
714 +    ['gdkgears', ['gtkgears.c']],
715 +    ['testglblending', ['gtkgears.c']],
722 diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c
724 --- a/testsuite/gtk/objects-finalize.c
725 +++ b/testsuite/gtk/objects-finalize.c