isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 10:00:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Avoid referencing file scope context in _context_new()

Browse Source 
cogl_context_new() had a mixture of references to the file scope context
variable (_context) and the local (context) variable. This renames the
file scope variable to _cogl_context to catch unnecessary references to
the old name and fixes the code accordingly to reference the local
variable instead.

Reviewed-by: Neil Roberts <neil@linux.intel.com>

(cherry picked from commit 33a9397ee1ae1729200be2e5084cf43cebb64289)
This commit is contained in:
Robert Bragg 2012-09-10 10:42:03 +01:00
parent 66169276f4
commit 2942fd362d
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cogl/cogl-context.c
View File

@ -77,7 +77,7 @@ COGL_OBJECT_DEFINE (Context, context);
extern void extern void
_cogl_create_context_driver (CoglContext *context); _cogl_create_context_driver (CoglContext *context);
static CoglContext *_context = NULL; static CoglContext *_cogl_context = NULL;
static void static void
_cogl_init_feature_overrides (CoglContext *ctx) _cogl_init_feature_overrides (CoglContext *ctx)
@ -174,7 +174,7 @@ cogl_context_new (CoglDisplay *display,
* has been updated to take an explicit context argument we have * has been updated to take an explicit context argument we have
* to immediately make our pointer the default context. * to immediately make our pointer the default context.
*/ */
_context = context; _cogl_context = context;
/* Init default values */ /* Init default values */
memset (context->features, 0, sizeof (context->features)); memset (context->features, 0, sizeof (context->features));
@ -263,7 +263,7 @@ cogl_context_new (CoglDisplay *display,
/* Initialise the driver specific state */ /* Initialise the driver specific state */
_cogl_init_feature_overrides (context); _cogl_init_feature_overrides (context);
_context->sampler_cache = _cogl_sampler_cache_new (_context); context->sampler_cache = _cogl_sampler_cache_new (context);
_cogl_pipeline_init_default_pipeline (); _cogl_pipeline_init_default_pipeline ();
_cogl_pipeline_init_default_layers (); _cogl_pipeline_init_default_layers ();
@ -396,14 +396,14 @@ cogl_context_new (CoglDisplay *display,
GE (context, glEnable (GL_ALPHA_TEST)); GE (context, glEnable (GL_ALPHA_TEST));
#endif #endif
_context->current_modelview_entry = NULL; context->current_modelview_entry = NULL;
_context->current_projection_entry = NULL; context->current_projection_entry = NULL;
_cogl_matrix_entry_identity_init (&_context->identity_entry); _cogl_matrix_entry_identity_init (&context->identity_entry);
_cogl_matrix_entry_cache_init (&_context->builtin_flushed_projection); _cogl_matrix_entry_cache_init (&context->builtin_flushed_projection);
_cogl_matrix_entry_cache_init (&_context->builtin_flushed_modelview); _cogl_matrix_entry_cache_init (&context->builtin_flushed_modelview);
default_texture_bitmap = default_texture_bitmap =
cogl_bitmap_new_for_data (_context, cogl_bitmap_new_for_data (context,
1, 1, /* width/height */ 1, 1, /* width/height */
COGL_PIXEL_FORMAT_RGBA_8888_PRE, COGL_PIXEL_FORMAT_RGBA_8888_PRE,
4, /* rowstride */ 4, /* rowstride */
@ -435,8 +435,8 @@ cogl_context_new (CoglDisplay *display,
context->atlases = NULL; context->atlases = NULL;
g_hook_list_init (&context->atlas_reorganize_callbacks, sizeof (GHook)); g_hook_list_init (&context->atlas_reorganize_callbacks, sizeof (GHook));
_context->buffer_map_fallback_array = g_byte_array_new (); context->buffer_map_fallback_array = g_byte_array_new ();
_context->buffer_map_fallback_in_use = FALSE; context->buffer_map_fallback_in_use = FALSE;
/* As far as I can tell, GL_POINT_SPRITE doesn't have any effect /* As far as I can tell, GL_POINT_SPRITE doesn't have any effect
unless GL_COORD_REPLACE is enabled for an individual unless GL_COORD_REPLACE is enabled for an individual
@ -445,7 +445,7 @@ cogl_context_new (CoglDisplay *display,
each pipeline to track whether any layers have point sprite each pipeline to track whether any layers have point sprite
coords enabled. We don't need to do this for GLES2 because point coords enabled. We don't need to do this for GLES2 because point
sprites are handled using a builtin varying in the shader. */ sprites are handled using a builtin varying in the shader. */
if (_context->driver != COGL_DRIVER_GLES2 && if (context->driver != COGL_DRIVER_GLES2 &&
cogl_has_feature (context, COGL_FEATURE_ID_POINT_SPRITE)) cogl_has_feature (context, COGL_FEATURE_ID_POINT_SPRITE))
GE (context, glEnable (GL_POINT_SPRITE)); GE (context, glEnable (GL_POINT_SPRITE));
@ -528,10 +528,10 @@ _cogl_context_free (CoglContext *context)
g_slist_free (context->texture_types); g_slist_free (context->texture_types);
g_slist_free (context->buffer_types); g_slist_free (context->buffer_types);
if (_context->current_modelview_entry) if (context->current_modelview_entry)
_cogl_matrix_entry_unref (_context->current_modelview_entry); _cogl_matrix_entry_unref (context->current_modelview_entry);
if (_context->current_projection_entry) if (context->current_projection_entry)
_cogl_matrix_entry_unref (_context->current_projection_entry); _cogl_matrix_entry_unref (context->current_projection_entry);
_cogl_matrix_entry_cache_destroy (&context->builtin_flushed_projection); _cogl_matrix_entry_cache_destroy (&context->builtin_flushed_projection);
_cogl_matrix_entry_cache_destroy (&context->builtin_flushed_modelview); _cogl_matrix_entry_cache_destroy (&context->builtin_flushed_modelview);
@ -559,10 +559,10 @@ _cogl_context_get_default (void)
{ {
GError *error = NULL; GError *error = NULL;
/* Create if doesn't exist yet */ /* Create if doesn't exist yet */
if (_context == NULL) if (_cogl_context == NULL)
{ {
_context = cogl_context_new (NULL, &error); _cogl_context = cogl_context_new (NULL, &error);
if (!_context) if (!_cogl_context)
{ {
g_warning ("Failed to create default context: %s", g_warning ("Failed to create default context: %s",
error->message); error->message);
@ -570,7 +570,7 @@ _cogl_context_get_default (void)
} }
} }
return _context; return _cogl_context;
} }
CoglDisplay * CoglDisplay *