From 4a63af0c631cd9391a6b3cef6fdb545e36a68730 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Mon, 23 Nov 2009 11:30:32 +0000 Subject: [PATCH] docs: Don't document cogl_flush_gl_state as public API This function was #if 0'd before we released Clutter 1.0 so there's no implementation of it. At some point we thought it might assist with developers breaking out into raw OpenGL. Breaking out to raw GL is a difficult problem though so we decided instead we will wait for a specific use case to arrise before trying to support it. --- clutter/cogl/cogl/cogl.c | 8 -------- clutter/cogl/cogl/cogl.h | 22 ---------------------- doc/reference/cogl/cogl-sections.txt | 1 - 3 files changed, 31 deletions(-) diff --git a/clutter/cogl/cogl/cogl.c b/clutter/cogl/cogl/cogl.c index ff5f67963..1c660552e 100644 --- a/clutter/cogl/cogl/cogl.c +++ b/clutter/cogl/cogl/cogl.c @@ -570,14 +570,6 @@ cogl_disable_fog (void) glDisable (GL_FOG); } -#if 0 -void -cogl_flush_gl_state (int flags) -{ - _cogl_draw_buffer_flush_state (_cogl_get_draw_buffer (), 0); -} -#endif - void cogl_flush (void) { diff --git a/clutter/cogl/cogl/cogl.h b/clutter/cogl/cogl/cogl.h index e03688ee6..9f3442851 100644 --- a/clutter/cogl/cogl/cogl.h +++ b/clutter/cogl/cogl/cogl.h @@ -952,28 +952,6 @@ void cogl_end_gl (void); void _cogl_destroy_context (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 - * - * As an optimization, COGL functions may not immediately modify GL's - * state, instead batching up changes and applying them "just in - * time." Unapplied state could include glEnable() flags and the - * current transformation matrix among other examples. If you want to - * use GL directly, you need to flush any state COGL may have kept - * around. cogl_flush_gl_state() syncs all of COGL's state to GL. - * - * Since: 1.0 - */ -void cogl_flush_gl_state (int flags); -#endif - /*< private >*/ #define COGL_DRIVER_ERROR (_cogl_driver_error_quark ()) diff --git a/doc/reference/cogl/cogl-sections.txt b/doc/reference/cogl/cogl-sections.txt index 713526648..c771d2f97 100644 --- a/doc/reference/cogl/cogl-sections.txt +++ b/doc/reference/cogl/cogl-sections.txt @@ -119,7 +119,6 @@ cogl_read_pixels_flags_get_type cogl_shader_type_get_type cogl_texture_flags_get_type cogl_vertices_mode_get_type -cogl_flush_gl_state