diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch | 225 |
1 files changed, 118 insertions, 107 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch b/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch index 0912c44ff3..eaf6aec2aa 100644 --- a/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch +++ b/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch @@ -1,4 +1,4 @@ -From a8fa547fdc1416b330aced805f5343ad912932ae Mon Sep 17 00:00:00 2001 +From a2e6b7cbbd6d741fed38d91b3742aa4a08395aba Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Tue, 21 Jun 2016 15:11:39 +0300 Subject: [PATCH 3/4] Add --disable-opengl configure option @@ -14,40 +14,43 @@ the very least modified. The patch is _not_ great from a maintenance point of view and modifying the library API is also a fairly nasty thing to do. -Long-term it would be good to find an alternative solution to this -(maybe a no-op backend for libepoxy?) +Next long term release (4.0) will require alternative solutions +as it actually will depend on OpenGL. Upstream-Status: Inappropriate [Evil eye expected from upstream] Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- - configure.ac | 13 +++++++++++-- - demos/gtk-demo/glarea.c | 13 +++++++++++++ - docs/tools/Makefile.am | 9 +++++++-- - docs/tools/widgets.c | 4 +++- - gdk/gdkdisplay.c | 4 +++- - gdk/gdkgl.c | 10 ++++++++++ - gdk/gdkglcontext.c | 6 ++++++ - gdk/gdkwindow.c | 13 +++++++++++++ - gdk/x11/Makefile.am | 30 ++++++++++++++++++++++++++---- - gdk/x11/gdkdisplay-x11.c | 6 +++++- - gdk/x11/gdkscreen-x11.c | 5 +++++ - gdk/x11/gdkwindow-x11.c | 4 ++++ + configure.ac | 13 +++++++-- + demos/gtk-demo/glarea.c | 14 +++++++++ + docs/tools/Makefile.am | 9 ++++-- + docs/tools/widgets.c | 4 ++- + gdk/gdkdisplay.c | 4 ++- + gdk/gdkgl.c | 10 +++++++ + gdk/gdkglcontext.c | 6 ++++ + gdk/gdkwindow.c | 13 +++++++++ + gdk/x11/Makefile.am | 30 +++++++++++++++++--- + gdk/x11/gdkdisplay-x11.c | 6 +++- + gdk/x11/gdkscreen-x11.c | 5 ++++ + gdk/x11/gdkwindow-x11.c | 4 +++ gdk/x11/gdkx-autocleanups.h | 2 ++ - gdk/x11/gdkx-with-gl-context.h | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - gdk/x11/gdkx-without-gl-context.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - gdk/x11/gdkx.h | 59 ----------------------------------------------------------- - gtk/Makefile.am | 3 +-- - gtk/gtkglarea.c | 20 +++++++++++++++++++- - gtk/inspector/general.c | 6 ++++++ - tests/Makefile.am | 10 +++++++--- + gdk/x11/gdkx-with-gl-context.h | 59 ++++++++++++++++++++++++++++++++++++++ + gdk/x11/gdkx-without-gl-context.h | 58 +++++++++++++++++++++++++++++++++++++ + gdk/x11/gdkx.h | 60 --------------------------------------- + gtk/Makefile.am | 3 +- + gtk/gtkglarea.c | 20 ++++++++++++- + gtk/inspector/general.c | 6 ++++ + tests/Makefile.am | 10 +++++-- testsuite/gtk/objects-finalize.c | 2 ++ - 21 files changed, 260 insertions(+), 76 deletions(-) + 21 files changed, 261 insertions(+), 77 deletions(-) + create mode 100644 gdk/x11/gdkx-with-gl-context.h + create mode 100644 gdk/x11/gdkx-without-gl-context.h + delete mode 100644 gdk/x11/gdkx.h diff --git a/configure.ac b/configure.ac -index a01824e..dde9dc5 100644 +index 965eec9..00bf544 100644 --- a/configure.ac +++ b/configure.ac -@@ -342,6 +342,15 @@ AC_ARG_ENABLE(mir-backend, +@@ -346,6 +346,15 @@ AC_ARG_ENABLE(mir-backend, [enable the Mir gdk backend])], [backend_set=yes]) @@ -63,7 +66,7 @@ index a01824e..dde9dc5 100644 AC_ARG_ENABLE(glx, [AS_HELP_STRING([--enable-glx], [When enabled Gdk will try to initialize GLX])]) -@@ -1333,7 +1342,7 @@ CFLAGS="$saved_cflags" +@@ -1352,7 +1361,7 @@ CFLAGS="$saved_cflags" LDFLAGS="$saved_ldflags" GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version" @@ -72,7 +75,7 @@ index a01824e..dde9dc5 100644 PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES) GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB" -@@ -1367,7 +1376,7 @@ fi +@@ -1386,7 +1395,7 @@ fi PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version" @@ -82,11 +85,14 @@ index a01824e..dde9dc5 100644 GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2" fi diff --git a/demos/gtk-demo/glarea.c b/demos/gtk-demo/glarea.c -index 3aba729..c6c79f7 100644 +index b51e4ae..82409c7 100644 --- a/demos/gtk-demo/glarea.c +++ b/demos/gtk-demo/glarea.c -@@ -5,7 +5,9 @@ +@@ -3,9 +3,12 @@ + * GtkGLArea is a widget that allows custom drawing using OpenGL calls. + */ ++#include "config.h" #include <math.h> #include <gtk/gtk.h> +#if HAVE_OPENGL @@ -95,7 +101,7 @@ index 3aba729..c6c79f7 100644 static GtkWidget *demo_window = NULL; -@@ -23,6 +25,8 @@ enum { +@@ -23,6 +26,8 @@ enum { /* Rotation angles on each axis */ static float rotation_angles[N_AXIS] = { 0.0 }; @@ -104,7 +110,7 @@ index 3aba729..c6c79f7 100644 /* The object we are drawing */ static const GLfloat vertex_data[] = { 0.f, 0.5f, 0.f, 1.f, -@@ -213,6 +217,7 @@ compute_mvp (float *res, +@@ -215,6 +220,7 @@ compute_mvp (float *res, static GLuint position_buffer; static GLuint program; static GLuint mvp_location; @@ -112,18 +118,18 @@ index 3aba729..c6c79f7 100644 /* We need to set up our state when we realize the GtkGLArea widget */ static void -@@ -223,8 +228,10 @@ realize (GtkWidget *widget) - if (gtk_gl_area_get_error (GTK_GL_AREA (widget)) != NULL) - return; +@@ -241,8 +247,10 @@ realize (GtkWidget *widget) + fragment_path = "/glarea/glarea-gl.fs.glsl"; + } +#ifdef HAVE_OPENGL init_buffers (&position_buffer, NULL); - init_shaders (&program, &mvp_location); + init_shaders (vertex_path, fragment_path, &program, &mvp_location); +#endif } /* We should tear down the state when unrealizing */ -@@ -236,10 +243,13 @@ unrealize (GtkWidget *widget) +@@ -254,10 +262,13 @@ unrealize (GtkWidget *widget) if (gtk_gl_area_get_error (GTK_GL_AREA (widget)) != NULL) return; @@ -137,7 +143,7 @@ index 3aba729..c6c79f7 100644 static void draw_triangle (void) { -@@ -272,6 +282,7 @@ draw_triangle (void) +@@ -290,6 +301,7 @@ draw_triangle (void) glBindBuffer (GL_ARRAY_BUFFER, 0); glUseProgram (0); } @@ -145,7 +151,7 @@ index 3aba729..c6c79f7 100644 static gboolean render (GtkGLArea *area, -@@ -280,6 +291,7 @@ render (GtkGLArea *area, +@@ -298,6 +310,7 @@ render (GtkGLArea *area, if (gtk_gl_area_get_error (area) != NULL) return FALSE; @@ -153,7 +159,7 @@ index 3aba729..c6c79f7 100644 /* Clear the viewport */ glClearColor (0.5, 0.5, 0.5, 1.0); glClear (GL_COLOR_BUFFER_BIT); -@@ -289,6 +301,7 @@ render (GtkGLArea *area, +@@ -307,6 +320,7 @@ render (GtkGLArea *area, /* Flush the contents of the pipeline */ glFlush (); @@ -204,10 +210,10 @@ index 932daf1..54239d6 100644 return info; diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c -index 6150ef7..2223629 100644 +index 6b012ca..311c7f7 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c -@@ -2360,7 +2360,9 @@ gboolean +@@ -2409,7 +2409,9 @@ gboolean gdk_display_make_gl_context_current (GdkDisplay *display, GdkGLContext *context) { @@ -219,7 +225,7 @@ index 6150ef7..2223629 100644 GdkRenderingMode diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c -index e8ba770..ba7c84b 100644 +index 8e7b8c2..b579b22 100644 --- a/gdk/gdkgl.c +++ b/gdk/gdkgl.c @@ -22,7 +22,9 @@ @@ -240,7 +246,7 @@ index e8ba770..ba7c84b 100644 static const char * get_vertex_type_name (int type) { -@@ -254,6 +257,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data) +@@ -208,6 +211,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data) glUseProgram (paint_data->current_program->program); } } @@ -248,15 +254,15 @@ index e8ba770..ba7c84b 100644 void gdk_gl_texture_quads (GdkGLContext *paint_context, -@@ -261,6 +265,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, - int n_quads, - GdkTexturedQuad *quads) +@@ -216,6 +220,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, + GdkTexturedQuad *quads, + gboolean flip_colors) { +#ifdef HAVE_OPENGL GdkGLContextPaintData *paint_data = gdk_gl_context_get_paint_data (paint_context); GdkGLContextProgram *program; GdkWindow *window = gdk_gl_context_get_window (paint_context); -@@ -324,6 +329,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, +@@ -289,6 +294,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, glDisableVertexAttribArray (program->position_location); glDisableVertexAttribArray (program->uv_location); @@ -264,7 +270,7 @@ index e8ba770..ba7c84b 100644 } /* x,y,width,height describes a rectangle in the gl render buffer -@@ -372,6 +378,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, +@@ -337,6 +343,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, int width, int height) { @@ -272,7 +278,7 @@ index e8ba770..ba7c84b 100644 GdkGLContext *paint_context; cairo_surface_t *image; cairo_matrix_t matrix; -@@ -692,6 +699,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, +@@ -707,6 +714,7 @@ out: if (clip_region) cairo_region_destroy (clip_region); @@ -280,7 +286,7 @@ index e8ba770..ba7c84b 100644 } /* This is always called with the paint context current */ -@@ -699,6 +707,7 @@ void +@@ -714,6 +722,7 @@ void gdk_gl_texture_from_surface (cairo_surface_t *surface, cairo_region_t *region) { @@ -288,14 +294,14 @@ index e8ba770..ba7c84b 100644 GdkGLContext *paint_context; cairo_surface_t *image; double device_x_offset, device_y_offset; -@@ -799,4 +808,5 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface, +@@ -814,4 +823,5 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface, glDisable (GL_SCISSOR_TEST); glDeleteTextures (1, &texture_id); +#endif } diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c -index 00a33eb..bd8a793 100644 +index c79dca0..8a7bec2 100644 --- a/gdk/gdkglcontext.c +++ b/gdk/gdkglcontext.c @@ -85,7 +85,9 @@ @@ -308,23 +314,23 @@ index 00a33eb..bd8a793 100644 typedef struct { GdkDisplay *display; -@@ -239,6 +241,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, +@@ -243,6 +245,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, int height, guint texture_target) { +#ifdef HAVE_OPENGL - g_return_if_fail (GDK_IS_GL_CONTEXT (context)); + GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context); - glPixelStorei (GL_UNPACK_ALIGNMENT, 4); -@@ -246,6 +249,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, - glTexImage2D (texture_target, 0, GL_RGBA, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, - cairo_image_surface_get_data (image_surface)); - glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); + g_return_if_fail (GDK_IS_GL_CONTEXT (context)); +@@ -286,6 +289,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, + glTexSubImage2D (texture_target, 0, 0, i, width, 1, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, (unsigned char*) data + (i * stride)); + } + } +#endif } - static void -@@ -635,6 +639,7 @@ gdk_gl_context_realize (GdkGLContext *context, + static gboolean +@@ -774,6 +778,7 @@ gdk_gl_context_realize (GdkGLContext *context, static void gdk_gl_context_check_extensions (GdkGLContext *context) { @@ -332,7 +338,7 @@ index 00a33eb..bd8a793 100644 GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context); gboolean has_npot, has_texture_rectangle; -@@ -677,6 +682,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context) +@@ -847,6 +852,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context) priv->use_texture_rectangle ? "yes" : "no")); priv->extensions_checked = TRUE; @@ -341,10 +347,10 @@ index 00a33eb..bd8a793 100644 /** diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c -index 66ebb9d..74a0c3a 100644 +index 689d666..fb84256 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c -@@ -44,7 +44,9 @@ +@@ -45,7 +45,9 @@ #include <math.h> @@ -354,7 +360,7 @@ index 66ebb9d..74a0c3a 100644 /* for the use of round() */ #include "fallback-c89.c" -@@ -2759,6 +2761,13 @@ gdk_window_get_paint_gl_context (GdkWindow *window, +@@ -2819,6 +2821,13 @@ gdk_window_get_paint_gl_context (GdkWindow *window, { GError *internal_error = NULL; @@ -368,7 +374,7 @@ index 66ebb9d..74a0c3a 100644 if (_gdk_gl_flags & GDK_GL_DISABLE) { g_set_error_literal (error, GDK_GL_ERROR, -@@ -2955,6 +2964,7 @@ gdk_window_begin_paint_region (GdkWindow *window, +@@ -2954,6 +2963,7 @@ gdk_window_begin_paint_internal (GdkWindow *window, } else { @@ -376,7 +382,7 @@ index 66ebb9d..74a0c3a 100644 gdk_gl_context_make_current (context); /* With gl we always need a surface to combine the gl drawing with the native drawing. */ -@@ -2969,6 +2979,7 @@ gdk_window_begin_paint_region (GdkWindow *window, +@@ -2968,6 +2978,7 @@ gdk_window_begin_paint_internal (GdkWindow *window, glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); glViewport (0, 0, ww, wh); @@ -384,7 +390,7 @@ index 66ebb9d..74a0c3a 100644 } } -@@ -3117,6 +3128,7 @@ gdk_window_end_paint (GdkWindow *window) +@@ -3031,6 +3042,7 @@ gdk_window_end_paint_internal (GdkWindow *window) gdk_gl_context_make_current (window->gl_paint_context); @@ -392,7 +398,7 @@ index 66ebb9d..74a0c3a 100644 if (!cairo_region_is_empty (opaque_region)) gdk_gl_texture_from_surface (window->current_paint.surface, opaque_region); -@@ -3127,6 +3139,7 @@ gdk_window_end_paint (GdkWindow *window) +@@ -3041,6 +3053,7 @@ gdk_window_end_paint_internal (GdkWindow *window) window->current_paint.need_blend_region); glDisable(GL_BLEND); } @@ -401,10 +407,10 @@ index 66ebb9d..74a0c3a 100644 cairo_region_destroy (opaque_region); diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am -index c488a31..4ce3c07 100644 +index 6289f3a..cbbac79 100644 --- a/gdk/x11/Makefile.am +++ b/gdk/x11/Makefile.am -@@ -39,8 +39,6 @@ libgdk_x11_la_SOURCES = \ +@@ -40,8 +40,6 @@ libgdk_x11_la_SOURCES = \ gdkeventtranslator.c \ gdkeventtranslator.h \ gdkgeometry-x11.c \ @@ -412,8 +418,8 @@ index c488a31..4ce3c07 100644 - gdkglcontext-x11.h \ gdkkeys-x11.c \ gdkmain-x11.c \ - gdkproperty-x11.c \ -@@ -53,14 +51,32 @@ libgdk_x11_la_SOURCES = \ + gdkmonitor-x11.c \ +@@ -56,14 +54,32 @@ libgdk_x11_la_SOURCES = \ gdkwindow-x11.h \ gdkxftdefaults.c \ gdkxid.c \ @@ -447,15 +453,15 @@ index c488a31..4ce3c07 100644 libgdkx11include_HEADERS = \ gdkx-autocleanups.h \ gdkx11applaunchcontext.h \ -@@ -74,7 +90,6 @@ libgdkx11include_HEADERS = \ +@@ -77,7 +93,6 @@ libgdkx11include_HEADERS = \ gdkx11display.h \ gdkx11displaymanager.h \ gdkx11dnd.h \ - gdkx11glcontext.h \ gdkx11keys.h \ + gdkx11monitor.h \ gdkx11property.h \ - gdkx11screen.h \ -@@ -83,9 +98,16 @@ libgdkx11include_HEADERS = \ +@@ -87,9 +102,16 @@ libgdkx11include_HEADERS = \ gdkx11visual.h \ gdkx11window.h @@ -473,7 +479,7 @@ index c488a31..4ce3c07 100644 + -include $(top_srcdir)/git.mk diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c -index de91c64..42d50f6 100644 +index ad65e29..91345ee 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -37,7 +37,9 @@ @@ -486,7 +492,7 @@ index de91c64..42d50f6 100644 #include "gdk-private.h" #include <glib.h> -@@ -2959,7 +2961,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class) +@@ -2994,7 +2996,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class) display_class->text_property_to_utf8_list = _gdk_x11_display_text_property_to_utf8_list; display_class->utf8_to_string_target = _gdk_x11_display_utf8_to_string_target; @@ -498,10 +504,10 @@ index de91c64..42d50f6 100644 display_class->get_default_seat = gdk_x11_display_get_default_seat; diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c -index 9d8ed20..bd46b00 100644 +index 7bf9979..cd1cc9d 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c -@@ -1968,3 +1968,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen) +@@ -1643,3 +1643,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen) { return get_netwm_cardinal_property (screen, "_NET_CURRENT_DESKTOP"); } @@ -511,7 +517,7 @@ index 9d8ed20..bd46b00 100644 +void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {} +#endif diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c -index 9ed087a..30d6eb7 100644 +index 3d6fd3b..2bd5c87 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -36,7 +36,9 @@ @@ -524,7 +530,7 @@ index 9ed087a..30d6eb7 100644 #include "gdkprivate-x11.h" #include "gdk-private.h" -@@ -5782,7 +5784,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) +@@ -5801,7 +5803,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) impl_class->set_opaque_region = gdk_x11_window_set_opaque_region; impl_class->set_shadow_width = gdk_x11_window_set_shadow_width; impl_class->show_window_menu = gdk_x11_window_show_window_menu; @@ -679,10 +685,10 @@ index 0000000..c9e2617 +#endif /* __GDK_X_H__ */ diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h deleted file mode 100644 -index ae05fa6..0000000 +index 1f64bcc..0000000 --- a/gdk/x11/gdkx.h +++ /dev/null -@@ -1,59 +0,0 @@ +@@ -1,60 +0,0 @@ -/* GDK - The GIMP Drawing Kit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * @@ -730,6 +736,7 @@ index ae05fa6..0000000 -#include <gdk/x11/gdkx11dnd.h> -#include <gdk/x11/gdkx11glcontext.h> -#include <gdk/x11/gdkx11keys.h> +-#include <gdk/x11/gdkx11monitor.h> -#include <gdk/x11/gdkx11property.h> -#include <gdk/x11/gdkx11screen.h> -#include <gdk/x11/gdkx11selection.h> @@ -743,10 +750,10 @@ index ae05fa6..0000000 - -#endif /* __GDK_X_H__ */ diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 6a53a2b..49a35e6 100644 +index 45fb7c2..ce81011 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am -@@ -1351,14 +1351,13 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins. +@@ -1411,14 +1411,13 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins. && cp xgen-gptbc gtkprivatetypebuiltins.c \ && rm -f xgen-gptbc @@ -763,7 +770,7 @@ index 6a53a2b..49a35e6 100644 gtktestutils.c: gtktypefuncs.c diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c -index 245fc6b..4214ad1 100644 +index 094378e..f7c7f47 100644 --- a/gtk/gtkglarea.c +++ b/gtk/gtkglarea.c @@ -28,7 +28,9 @@ @@ -776,7 +783,7 @@ index 245fc6b..4214ad1 100644 /** * SECTION:gtkglarea -@@ -357,9 +359,12 @@ gtk_gl_area_real_create_context (GtkGLArea *area) +@@ -368,9 +370,12 @@ gtk_gl_area_real_create_context (GtkGLArea *area) static void gtk_gl_area_resize (GtkGLArea *area, int width, int height) { @@ -789,7 +796,7 @@ index 245fc6b..4214ad1 100644 /* * Creates all the buffer objects needed for rendering the scene */ -@@ -467,6 +472,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area) +@@ -482,6 +487,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area) priv->needs_render = TRUE; } @@ -797,7 +804,7 @@ index 245fc6b..4214ad1 100644 /** * gtk_gl_area_attach_buffers: -@@ -485,6 +491,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area) +@@ -500,6 +506,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area) void gtk_gl_area_attach_buffers (GtkGLArea *area) { @@ -805,7 +812,7 @@ index 245fc6b..4214ad1 100644 GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area); g_return_if_fail (GTK_IS_GL_AREA (area)); -@@ -517,11 +524,13 @@ gtk_gl_area_attach_buffers (GtkGLArea *area) +@@ -532,11 +539,13 @@ gtk_gl_area_attach_buffers (GtkGLArea *area) glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, priv->depth_stencil_buffer); } @@ -819,7 +826,7 @@ index 245fc6b..4214ad1 100644 GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area); if (priv->context == NULL) -@@ -553,6 +562,7 @@ gtk_gl_area_delete_buffers (GtkGLArea *area) +@@ -568,6 +577,7 @@ gtk_gl_area_delete_buffers (GtkGLArea *area) glDeleteFramebuffersEXT (1, &priv->frame_buffer); priv->frame_buffer = 0; } @@ -827,7 +834,7 @@ index 245fc6b..4214ad1 100644 } static void -@@ -663,6 +673,7 @@ gtk_gl_area_draw (GtkWidget *widget, +@@ -678,6 +688,7 @@ gtk_gl_area_draw (GtkWidget *widget, GtkGLArea *area = GTK_GL_AREA (widget); GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area); gboolean unused; @@ -835,7 +842,7 @@ index 245fc6b..4214ad1 100644 int w, h, scale; GLenum status; -@@ -674,7 +685,6 @@ gtk_gl_area_draw (GtkWidget *widget, +@@ -689,7 +700,6 @@ gtk_gl_area_draw (GtkWidget *widget, gtk_widget_get_allocated_height (widget)); return FALSE; } @@ -843,7 +850,7 @@ index 245fc6b..4214ad1 100644 if (priv->context == NULL) return FALSE; -@@ -720,6 +730,14 @@ gtk_gl_area_draw (GtkWidget *widget, +@@ -735,6 +745,14 @@ gtk_gl_area_draw (GtkWidget *widget, } return TRUE; @@ -859,7 +866,7 @@ index 245fc6b..4214ad1 100644 static gboolean diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c -index 4eab3a7..c4e900e 100644 +index c241ec8..24576dd 100644 --- a/gtk/inspector/general.c +++ b/gtk/inspector/general.c @@ -33,8 +33,10 @@ @@ -873,7 +880,7 @@ index 4eab3a7..c4e900e 100644 #ifdef GDK_WINDOWING_WIN32 #include "win32/gdkwin32.h" -@@ -147,6 +149,7 @@ append_extension_row (GtkInspectorGeneral *gen, +@@ -196,6 +198,7 @@ add_label_row (GtkInspectorGeneral *gen, gtk_size_group_add_widget (GTK_SIZE_GROUP (gen->priv->labels), label); } @@ -881,15 +888,15 @@ index 4eab3a7..c4e900e 100644 #ifdef GDK_WINDOWING_X11 static void append_glx_extension_row (GtkInspectorGeneral *gen, -@@ -156,6 +159,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen, - append_extension_row (gen, ext, epoxy_has_glx_extension (dpy, 0, ext)); +@@ -205,6 +208,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen, + add_check_row (gen, GTK_LIST_BOX (gen->priv->gl_box), ext, epoxy_has_glx_extension (dpy, 0, ext), 0); } #endif +#endif #ifdef GDK_WINDOWING_WAYLAND static void -@@ -171,6 +175,7 @@ append_egl_extension_row (GtkInspectorGeneral *gen, +@@ -254,6 +258,7 @@ wayland_get_display (struct wl_display *wl_display) static void init_gl (GtkInspectorGeneral *gen) { @@ -897,7 +904,7 @@ index 4eab3a7..c4e900e 100644 #ifdef GDK_WINDOWING_X11 if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) { -@@ -197,6 +202,7 @@ init_gl (GtkInspectorGeneral *gen) +@@ -280,6 +285,7 @@ init_gl (GtkInspectorGeneral *gen) } else #endif @@ -906,7 +913,7 @@ index 4eab3a7..c4e900e 100644 if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) { diff --git a/tests/Makefile.am b/tests/Makefile.am -index 681807d..2941a36 100644 +index f86c166..ba1acad 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ @@ -918,19 +925,20 @@ index 681807d..2941a36 100644 testgrid \ testgtk \ testheaderbar \ -@@ -169,11 +167,17 @@ noinst_PROGRAMS = $(TEST_PROGS) \ +@@ -170,12 +168,18 @@ noinst_PROGRAMS = $(TEST_PROGS) \ testactionbar \ testwindowsize \ testpopover \ - gdkgears \ listmodel \ testpopup \ + testpopupat \ $(NULL) +if HAVE_OPENGL +noinst_PROGRAMS += -+ testglarea \ -+ testglblending \ ++ testglarea \ ++ testglblending \ + gdkgears +endif + @@ -938,7 +946,7 @@ index 681807d..2941a36 100644 noinst_PROGRAMS += testerrors endif diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c -index e0ebee0..703643c 100644 +index 0b3a519..07b096f 100644 --- a/testsuite/gtk/objects-finalize.c +++ b/testsuite/gtk/objects-finalize.c @@ -115,8 +115,10 @@ main (int argc, char **argv) @@ -951,4 +959,7 @@ index e0ebee0..703643c 100644 +#endif /* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */ all_types[i] != GDK_TYPE_PIXBUF_LOADER && - all_types[i] != gdk_pixbuf_simple_anim_iter_get_type()) + all_types[i] != GDK_TYPE_DRAWING_CONTEXT && +-- +2.12.0 + |