diff options
author | Alexander Larsson <alexl@redhat.com> | 2014-11-20 12:22:06 +0100 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2014-11-20 12:38:04 +0100 |
commit | cf94da2ca1880340f146293916efffda679ca7a6 (patch) | |
tree | b5cf19a4f72bc915c5e3aee87e7f88e86295b13e /gdk | |
parent | 800c712738f5666937e32d9f8cb32353513b9423 (diff) | |
download | gtk+-cf94da2ca1880340f146293916efffda679ca7a6.tar.gz |
GdkGLContext: Remove unused update vfunc
The update virtual function for GdkGLContext is unused and is a
leftover from a previous GL approach. Just remove it.
https://bugzilla.gnome.org/show_bug.cgi?id=739750
Diffstat (limited to 'gdk')
-rw-r--r-- | gdk/gdkglcontextprivate.h | 1 | ||||
-rw-r--r-- | gdk/mir/gdkmirglcontext.c | 19 | ||||
-rw-r--r-- | gdk/wayland/gdkglcontext-wayland.c | 19 | ||||
-rw-r--r-- | gdk/x11/gdkglcontext-x11.c | 20 |
4 files changed, 0 insertions, 59 deletions
diff --git a/gdk/gdkglcontextprivate.h b/gdk/gdkglcontextprivate.h index 31f4a64785..9a4ee46977 100644 --- a/gdk/gdkglcontextprivate.h +++ b/gdk/gdkglcontextprivate.h @@ -40,7 +40,6 @@ struct _GdkGLContextClass { GObjectClass parent_class; - void (* update) (GdkGLContext *context); void (* end_frame) (GdkGLContext *context, cairo_region_t *painted, cairo_region_t *damage); diff --git a/gdk/mir/gdkmirglcontext.c b/gdk/mir/gdkmirglcontext.c index 2868baea07..8a7494be48 100644 --- a/gdk/mir/gdkmirglcontext.c +++ b/gdk/mir/gdkmirglcontext.c @@ -27,24 +27,6 @@ G_DEFINE_TYPE (GdkMirGLContext, gdk_mir_gl_context, GDK_TYPE_GL_CONTEXT) static void -gdk_mir_gl_context_update (GdkGLContext *context) -{ - GdkWindow *window = gdk_gl_context_get_window (context); - int width, height; - - gdk_gl_context_make_current (context); - - width = gdk_window_get_width (window); - height = gdk_window_get_height (window); - - GDK_NOTE (OPENGL, g_print ("Updating GL viewport size to { %d, %d } for window %p (context: %p)\n", - width, height, - window, context)); - - glViewport (0, 0, width, height); -} - -static void gdk_mir_gl_context_end_frame (GdkGLContext *context, cairo_region_t *painted, cairo_region_t *damage) @@ -114,7 +96,6 @@ gdk_mir_gl_context_class_init (GdkMirGLContextClass *klass) GdkGLContextClass *context_class = GDK_GL_CONTEXT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - context_class->update = gdk_mir_gl_context_update; context_class->end_frame = gdk_mir_gl_context_end_frame; gobject_class->dispose = gdk_mir_gl_context_dispose; } diff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c index 04d9094793..c8d4ed2b22 100644 --- a/gdk/wayland/gdkglcontext-wayland.c +++ b/gdk/wayland/gdkglcontext-wayland.c @@ -37,24 +37,6 @@ G_DEFINE_TYPE (GdkWaylandGLContext, gdk_wayland_gl_context, GDK_TYPE_GL_CONTEXT) static void gdk_x11_gl_context_dispose (GObject *gobject); -static void -gdk_wayland_gl_context_update (GdkGLContext *context) -{ - GdkWindow *window = gdk_gl_context_get_window (context); - int width, height; - - gdk_gl_context_make_current (context); - - width = gdk_window_get_width (window); - height = gdk_window_get_height (window); - - GDK_NOTE (OPENGL, g_print ("Updating GL viewport size to { %d, %d } for window %p (context: %p)\n", - width, height, - window, context)); - - glViewport (0, 0, width, height); -} - void gdk_wayland_window_invalidate_for_new_frame (GdkWindow *window, cairo_region_t *update_area) @@ -163,7 +145,6 @@ gdk_wayland_gl_context_class_init (GdkWaylandGLContextClass *klass) GdkGLContextClass *context_class = GDK_GL_CONTEXT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - context_class->update = gdk_wayland_gl_context_update; context_class->end_frame = gdk_wayland_gl_context_end_frame; gobject_class->dispose = gdk_x11_gl_context_dispose; } diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c index 847a2adb6f..3383d3d520 100644 --- a/gdk/x11/gdkglcontext-x11.c +++ b/gdk/x11/gdkglcontext-x11.c @@ -94,25 +94,6 @@ set_glx_drawable_info (GdkWindow *window, } static void -gdk_x11_gl_context_update (GdkGLContext *context) -{ - GdkWindow *window = gdk_gl_context_get_window (context); - int width, height; - - gdk_gl_context_make_current (context); - - width = gdk_window_get_width (window); - height = gdk_window_get_height (window); - - GDK_NOTE (OPENGL, g_print ("Updating GL viewport size to { %d, %d } for window %lu (context: %p)\n", - width, height, - (unsigned long) gdk_x11_window_get_xid (window), - context)); - - glViewport (0, 0, width, height); -} - -static void maybe_wait_for_vblank (GdkDisplay *display, GLXDrawable drawable) { @@ -563,7 +544,6 @@ gdk_x11_gl_context_class_init (GdkX11GLContextClass *klass) GdkGLContextClass *context_class = GDK_GL_CONTEXT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - context_class->update = gdk_x11_gl_context_update; context_class->end_frame = gdk_x11_gl_context_end_frame; context_class->texture_from_surface = gdk_x11_gl_context_texture_from_surface; |