AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Rename gdk_gl_context_flush_buffer to gdk_gl_context_end_frame

Browse Source 
This makes a lot more sense.
This commit is contained in:
Alexander Larsson 2014-10-27 16:33:37 +01:00
parent f1fe70e4ad
commit 3013997e23
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gdk/gdkglcontext.c
View File

@ -242,7 +242,7 @@ gdk_gl_context_get_visual (GdkGLContext *context)
}
/*< private >
* gdk_gl_context_flush_buffer:
* gdk_gl_context_end_frame:
* @context: a #GdkGLContext
* @painted: The area that has been redrawn this frame
* @damage: The area that we know is actually different from the last frame
@ -256,13 +256,13 @@ gdk_gl_context_get_visual (GdkGLContext *context)
* Since: 3.16
*/
void
gdk_gl_context_flush_buffer (GdkGLContext *context,
cairo_region_t *painted,
cairo_region_t *damage)
gdk_gl_context_end_frame (GdkGLContext *context,
cairo_region_t *painted,
cairo_region_t *damage)
{
g_return_if_fail (GDK_IS_GL_CONTEXT (context));
GDK_GL_CONTEXT_GET_CLASS (context)->flush_buffer (context, painted, damage);
GDK_GL_CONTEXT_GET_CLASS (context)->end_frame (context, painted, damage);
}
/**

16
gdk/gdkglcontextprivate.h
View File

@ -41,17 +41,17 @@ struct _GdkGLContextClass
GObjectClass parent_class;
void (* update) (GdkGLContext *context);
void (* flush_buffer) (GdkGLContext *context,
cairo_region_t *painted,
cairo_region_t *damage);
void (* end_frame) (GdkGLContext *context,
cairo_region_t *painted,
cairo_region_t *damage);
gboolean (* texture_from_surface) (GdkGLContext *context,
cairo_surface_t *surface,
cairo_region_t *region);
cairo_surface_t *surface,
cairo_region_t *region);
};
void gdk_gl_context_flush_buffer (GdkGLContext *context,
cairo_region_t *painted,
cairo_region_t *damage);
void gdk_gl_context_end_frame (GdkGLContext *context,
cairo_region_t *painted,
cairo_region_t *damage);
G_END_DECLS

6
gdk/gdkwindow.c
View File

@ -3086,9 +3086,9 @@ gdk_window_end_paint (GdkWindow *window)
cairo_region_destroy (opaque_region);
gdk_gl_context_flush_buffer (window->gl_paint_context,
window->current_paint.region,
window->active_update_area);
gdk_gl_context_end_frame (window->gl_paint_context,
window->current_paint.region,
window->active_update_area);
if (epoxy_has_gl_extension ("GL_GREMEDY_frame_terminator"))
glFrameTerminatorGREMEDY();

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

@ -117,9 +117,9 @@ gdk_wayland_window_invalidate_for_new_frame (GdkWindow *window,
}
static void
gdk_wayland_gl_context_flush_buffer (GdkGLContext *context,
cairo_region_t *painted,
cairo_region_t *damage)
gdk_wayland_gl_context_end_frame (GdkGLContext *context,
cairo_region_t *painted,
cairo_region_t *damage)
{
GdkWindow *window = gdk_gl_context_get_window (context);
GdkDisplay *display = gdk_window_get_display (window);
@ -161,7 +161,7 @@ gdk_wayland_gl_context_class_init (GdkWaylandGLContextClass *klass)
GdkGLContextClass *context_class = GDK_GL_CONTEXT_CLASS (klass);
context_class->update = gdk_wayland_gl_context_update;
context_class->flush_buffer = gdk_wayland_gl_context_flush_buffer;
context_class->end_frame = gdk_wayland_gl_context_end_frame;
}
static void

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

@ -197,9 +197,9 @@ gdk_x11_window_invalidate_for_new_frame (GdkWindow *window,
}
static void
gdk_x11_gl_context_flush_buffer (GdkGLContext *context,
cairo_region_t *painted,
cairo_region_t *damage)
gdk_x11_gl_context_end_frame (GdkGLContext *context,
cairo_region_t *painted,
cairo_region_t *damage)
{
GdkX11GLContext *context_x11 = GDK_X11_GL_CONTEXT (context);
GdkWindow *window = gdk_gl_context_get_window (context);
@ -433,7 +433,7 @@ gdk_x11_gl_context_class_init (GdkX11GLContextClass *klass)
GdkGLContextClass *context_class = GDK_GL_CONTEXT_CLASS (klass);
context_class->update = gdk_x11_gl_context_update;
context_class->flush_buffer = gdk_x11_gl_context_flush_buffer;
context_class->end_frame = gdk_x11_gl_context_end_frame;
context_class->texture_from_surface = gdk_x11_gl_context_texture_from_surface;
}