summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2014-10-27 16:33:37 +0100
committerAlexander Larsson <alexl@redhat.com>2014-10-27 16:33:37 +0100
commit3013997e234d86dcdaa212c50d4b263c44a7c416 (patch)
tree584ae883d2b16cbe0f8ba87716d9024a78557454
parentf1fe70e4adfa468c081bfb9d1d57364ef02496d8 (diff)
downloadgtk+-3013997e234d86dcdaa212c50d4b263c44a7c416.tar.gz
Rename gdk_gl_context_flush_buffer to gdk_gl_context_end_frame
This makes a lot more sense.
-rw-r--r--gdk/gdkglcontext.c10
-rw-r--r--gdk/gdkglcontextprivate.h16
-rw-r--r--gdk/gdkwindow.c6
-rw-r--r--gdk/wayland/gdkglcontext-wayland.c8
-rw-r--r--gdk/x11/gdkglcontext-x11.c8
5 files changed, 24 insertions, 24 deletions
diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
index 1fba34d507..1bfb17f7e7 100644
--- a/gdk/gdkglcontext.c
+++ b/gdk/gdkglcontext.c
@@ -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);
}
/**
diff --git a/gdk/gdkglcontextprivate.h b/gdk/gdkglcontextprivate.h
index b973eb2af9..96d4924613 100644
--- a/gdk/gdkglcontextprivate.h
+++ b/gdk/gdkglcontextprivate.h
@@ -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
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 25d20b1282..676a816be3 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -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();
diff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c
index 8894e8bc81..fbe79abf40 100644
--- a/gdk/wayland/gdkglcontext-wayland.c
+++ b/gdk/wayland/gdkglcontext-wayland.c
@@ -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
diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c
index 7db5376de2..6162b1048c 100644
--- a/gdk/x11/gdkglcontext-x11.c
+++ b/gdk/x11/gdkglcontext-x11.c
@@ -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;
}