[cogl] Remove cogl_{create,destroy}_context from the public API

cogl_create_context is dealt with internally when _cogl_get_default context
is called, and cogl_destroy_context is currently never called.

It might be nicer later to get an object back when creating a context so
Cogl can support multiple contexts, so these functions are being removed
from the API until we get a chance to address context management properly.

For now cogl_destroy_context is still exported as _cogl_destroy_context so
Clutter could at least install a library deinit handler to call it.
This commit is contained in:
Robert Bragg 2009-05-26 15:41:53 +01:00
parent 59bd824404
commit 12c8ff8606
4 changed files with 16 additions and 23 deletions

View File

@ -55,22 +55,6 @@ G_BEGIN_DECLS
* General utility functions for COGL. * General utility functions for COGL.
*/ */
/* Context manipulation */
/**
* cogl_create_context:
*
* FIXME
*/
gboolean cogl_create_context (void);
/**
* cogl_destroy_context:
*
* FIXME
*/
void cogl_destroy_context (void);
/** /**
* cogl_get_option_group: * cogl_get_option_group:
* *
@ -628,6 +612,18 @@ void cogl_push_draw_buffer (void);
*/ */
void cogl_pop_draw_buffer (void); void cogl_pop_draw_buffer (void);
/*
* Internal API available only to Clutter.
*
* These are typically only to deal with the poor seperation of
* responsabilities that currently exists between Clutter and Cogl.
* Eventually a lot of the backend code currently in Clutter will
* move down into Cogl and these functions will be removed.
*/
void _cogl_destroy_context (void);
/* XXX: Removed before we release Clutter 1.0 since the implementation /* 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 * 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 * have some one with a good usecase, we can't pretend to support breaking

View File

@ -37,7 +37,7 @@
static CoglContext *_context = NULL; static CoglContext *_context = NULL;
static gboolean gl_is_indirect = FALSE; static gboolean gl_is_indirect = FALSE;
gboolean static gboolean
cogl_create_context () cogl_create_context ()
{ {
GLubyte default_texture_data[] = { 0xff, 0xff, 0xff, 0x0 }; GLubyte default_texture_data[] = { 0xff, 0xff, 0xff, 0x0 };
@ -175,7 +175,7 @@ cogl_create_context ()
} }
void void
cogl_destroy_context () _cogl_destroy_context ()
{ {
if (_context == NULL) if (_context == NULL)
return; return;

View File

@ -39,7 +39,7 @@
static CoglContext *_context = NULL; static CoglContext *_context = NULL;
static gboolean gl_is_indirect = FALSE; static gboolean gl_is_indirect = FALSE;
gboolean static gboolean
cogl_create_context () cogl_create_context ()
{ {
GLubyte default_texture_data[] = { 0xff, 0xff, 0xff, 0x0 }; GLubyte default_texture_data[] = { 0xff, 0xff, 0xff, 0x0 };
@ -133,7 +133,7 @@ cogl_create_context ()
} }
void void
cogl_destroy_context () _cogl_destroy_context ()
{ {
if (_context == NULL) if (_context == NULL)
return; return;

View File

@ -15,9 +15,6 @@ COGL_UNPREMULT_MASK
CoglPixelFormat CoglPixelFormat
CoglBufferTarget CoglBufferTarget
<SUBSECTION> <SUBSECTION>
cogl_create_context
cogl_destroy_context
<SUBSECTION>
CoglFeatureFlags CoglFeatureFlags
cogl_get_features cogl_get_features
cogl_features_available cogl_features_available