From 7fc6613fe92dddc7cf4635cb9c03cbf71964b179 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Tue, 22 Feb 2011 17:13:56 +0000 Subject: [PATCH] Remove unused _cogl_swap_buffers_notify Recently _cogl_swap_buffers_notify was added (in 142b229c5c26) so that Cogl would be notified when Clutter performs a swap buffers request for a given onscreen framebuffer. It was expected this would be required for the recent cogl_read_pixel optimization that was implemented (ref 1bdb0e6e98db) but in the end it wasn't used. Since it wasn't used in the end this patch removes the API. --- cogl/cogl-framebuffer-private.h | 3 --- cogl/cogl-framebuffer.c | 5 ----- cogl/cogl.c | 11 ----------- cogl/cogl.h | 3 --- 4 files changed, 22 deletions(-) diff --git a/cogl/cogl-framebuffer-private.h b/cogl/cogl-framebuffer-private.h index 14a4d049e..b1a99a8bf 100644 --- a/cogl/cogl-framebuffer-private.h +++ b/cogl/cogl-framebuffer-private.h @@ -212,9 +212,6 @@ _cogl_framebuffer_flush_journal (CoglFramebuffer *framebuffer); void _cogl_framebuffer_flush_dependency_journals (CoglFramebuffer *framebuffer); -void -_cogl_framebuffer_swap_notify (CoglFramebuffer *framebuffer); - gboolean _cogl_framebuffer_try_fast_read_pixel (CoglFramebuffer *framebuffer, int x, diff --git a/cogl/cogl-framebuffer.c b/cogl/cogl-framebuffer.c index 28b95ab9f..50a7d07d6 100644 --- a/cogl/cogl-framebuffer.c +++ b/cogl/cogl-framebuffer.c @@ -457,11 +457,6 @@ _cogl_framebuffer_clear (CoglFramebuffer *framebuffer, cogl_color_get_alpha_float (color)); } -void -_cogl_framebuffer_swap_notify (CoglFramebuffer *framebuffer) -{ -} - int _cogl_framebuffer_get_width (CoglFramebuffer *framebuffer) { diff --git a/cogl/cogl.c b/cogl/cogl.c index 62636d68d..4ee9318a4 100644 --- a/cogl/cogl.c +++ b/cogl/cogl.c @@ -1109,14 +1109,3 @@ _cogl_error_quark (void) { return g_quark_from_static_string ("cogl-error-quark"); } - -/* Until Cogl becomes responsible for handling swap-buffer requests - * this API is used by Clutter to notify us when it issues a - * swap-buffer on our behalf. */ -void -_cogl_swap_buffers_notify (void) -{ - _COGL_GET_CONTEXT (ctx, NO_RETVAL); - - _cogl_framebuffer_swap_notify (_cogl_get_draw_buffer ()); -} diff --git a/cogl/cogl.h b/cogl/cogl.h index 6eed72c7d..11ee5c480 100644 --- a/cogl/cogl.h +++ b/cogl/cogl.h @@ -1280,9 +1280,6 @@ _cogl_driver_error_quark (void); void _cogl_onscreen_clutter_backend_set_size (int width, int height); -void -_cogl_swap_buffers_notify (void); - CoglFramebuffer * _cogl_get_draw_buffer (void);