From 68214fe4b88603c73a77d5cc543f8688a0bde82c Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Sat, 23 May 2009 17:52:18 +0100 Subject: [PATCH] [cogl] Remove cogl_flush_gl_state from the API This is being removed before we release Clutter 1.0 since the implementation wasn't complete, and so we assume no one is using this yet. Util we have someone with a good usecase, we can't pretend to support breaking out into raw OpenGL. --- clutter/cogl/cogl.h.in | 8 +++++++- clutter/cogl/common/cogl.c | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/clutter/cogl/cogl.h.in b/clutter/cogl/cogl.h.in index bd36983..af4b265 100644 --- a/clutter/cogl/cogl.h.in +++ b/clutter/cogl/cogl.h.in @@ -628,7 +628,12 @@ void cogl_push_draw_buffer (void); */ void cogl_pop_draw_buffer (void); -/** +/* XXX: Removed before we release Clutter 1.0 since the implementation + * wasn't complete, and so we assume no one is using this yet. Util we + * have some one with a good usecase, we can't pretend to support breaking + * out into raw OpenGL. */ +#if 0 +/* * cogl_flush_gl_state: * @flags: flags controlling what is flushed; currently unused, pass in 0 * @@ -642,6 +647,7 @@ void cogl_pop_draw_buffer (void); * Since: 1.0 */ void cogl_flush_gl_state (int flags); +#endif /* private */ void _cogl_set_indirect_context (gboolean indirect); diff --git a/clutter/cogl/common/cogl.c b/clutter/cogl/common/cogl.c index 8b85924..81c43bd 100644 --- a/clutter/cogl/common/cogl.c +++ b/clutter/cogl/common/cogl.c @@ -654,9 +654,11 @@ cogl_disable_fog (void) glDisable (GL_FOG); } +#if 0 void cogl_flush_gl_state (int flags) { _cogl_current_matrix_state_flush (); } +#endif -- 2.7.4