callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GdkGLContext: Remove unused update vfunc

Browse Source 
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
This commit is contained in:
Alexander Larsson
2014-11-20 12:22:06 +01:00
parent 800c712738
commit cf94da2ca1
4 changed files with 0 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gdk/gdkglcontextprivate.h
View File

@ -40,7 +40,6 @@ struct _GdkGLContextClass
{ {
GObjectClass parent_class; GObjectClass parent_class;
void (* update) (GdkGLContext *context);
void (* end_frame) (GdkGLContext *context, void (* end_frame) (GdkGLContext *context,
cairo_region_t *painted, cairo_region_t *painted,
cairo_region_t *damage); cairo_region_t *damage);

19
gdk/mir/gdkmirglcontext.c
View File

@ -26,24 +26,6 @@
G_DEFINE_TYPE (GdkMirGLContext, gdk_mir_gl_context, GDK_TYPE_GL_CONTEXT) 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 static void
gdk_mir_gl_context_end_frame (GdkGLContext *context, gdk_mir_gl_context_end_frame (GdkGLContext *context,
cairo_region_t *painted, cairo_region_t *painted,
@ -114,7 +96,6 @@ gdk_mir_gl_context_class_init (GdkMirGLContextClass *klass)
GdkGLContextClass *context_class = GDK_GL_CONTEXT_CLASS (klass); GdkGLContextClass *context_class = GDK_GL_CONTEXT_CLASS (klass);
GObjectClass *gobject_class = G_OBJECT_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; context_class->end_frame = gdk_mir_gl_context_end_frame;
gobject_class->dispose = gdk_mir_gl_context_dispose; gobject_class->dispose = gdk_mir_gl_context_dispose;
} }

19
gdk/wayland/gdkglcontext-wayland.c
View File

@ -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_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 void
gdk_wayland_window_invalidate_for_new_frame (GdkWindow *window, gdk_wayland_window_invalidate_for_new_frame (GdkWindow *window,
cairo_region_t *update_area) 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); GdkGLContextClass *context_class = GDK_GL_CONTEXT_CLASS (klass);
GObjectClass *gobject_class = G_OBJECT_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; context_class->end_frame = gdk_wayland_gl_context_end_frame;
gobject_class->dispose = gdk_x11_gl_context_dispose; gobject_class->dispose = gdk_x11_gl_context_dispose;
} }

20
gdk/x11/gdkglcontext-x11.c
View File

@ -93,25 +93,6 @@ set_glx_drawable_info (GdkWindow *window,
drawable_info_free); drawable_info_free);
} }
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 static void
maybe_wait_for_vblank (GdkDisplay *display, maybe_wait_for_vblank (GdkDisplay *display,
GLXDrawable drawable) GLXDrawable drawable)
@ -563,7 +544,6 @@ gdk_x11_gl_context_class_init (GdkX11GLContextClass *klass)
GdkGLContextClass *context_class = GDK_GL_CONTEXT_CLASS (klass); GdkGLContextClass *context_class = GDK_GL_CONTEXT_CLASS (klass);
GObjectClass *gobject_class = G_OBJECT_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->end_frame = gdk_x11_gl_context_end_frame;
context_class->texture_from_surface = gdk_x11_gl_context_texture_from_surface; context_class->texture_from_surface = gdk_x11_gl_context_texture_from_surface;