From a0d47d56606a9d737a1876f0e2905117ff352bd9 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Tue, 1 Jan 2013 14:15:25 +0000 Subject: [PATCH] build: Hide cogl_pipeline_cache_{new,free}() Those symbols should not be public and were exported as they started with cogl_. (cherry picked from commit 68a55f1dc70ea60fcccbe226029e585886feddc2) --- cogl/cogl-context.c | 4 ++-- cogl/cogl-pipeline-cache.c | 4 ++-- cogl/cogl-pipeline-cache.h | 4 ++-- cogl/cogl.symbols | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cogl/cogl-context.c b/cogl/cogl-context.c index f0a3ade50..3922cb13c 100644 --- a/cogl/cogl-context.c +++ b/cogl/cogl-context.c @@ -348,7 +348,7 @@ cogl_context_new (CoglDisplay *display, context->legacy_depth_test_enabled = FALSE; - context->pipeline_cache = cogl_pipeline_cache_new (); + context->pipeline_cache = _cogl_pipeline_cache_new (); for (i = 0; i < COGL_BUFFER_BIND_TARGET_COUNT; i++) context->current_buffer[i] = NULL; @@ -557,7 +557,7 @@ _cogl_context_free (CoglContext *context) _cogl_matrix_entry_cache_destroy (&context->builtin_flushed_projection); _cogl_matrix_entry_cache_destroy (&context->builtin_flushed_modelview); - cogl_pipeline_cache_free (context->pipeline_cache); + _cogl_pipeline_cache_free (context->pipeline_cache); _cogl_sampler_cache_free (context->sampler_cache); diff --git a/cogl/cogl-pipeline-cache.c b/cogl/cogl-pipeline-cache.c index eb2fe4597..fab3614f6 100644 --- a/cogl/cogl-pipeline-cache.c +++ b/cogl/cogl-pipeline-cache.c @@ -143,7 +143,7 @@ pipeline_combined_equal (const void *a, const void *b) } CoglPipelineCache * -cogl_pipeline_cache_new (void) +_cogl_pipeline_cache_new (void) { CoglPipelineCache *cache = g_new (CoglPipelineCache, 1); @@ -164,7 +164,7 @@ cogl_pipeline_cache_new (void) } void -cogl_pipeline_cache_free (CoglPipelineCache *cache) +_cogl_pipeline_cache_free (CoglPipelineCache *cache) { g_hash_table_destroy (cache->fragment_hash); g_hash_table_destroy (cache->vertex_hash); diff --git a/cogl/cogl-pipeline-cache.h b/cogl/cogl-pipeline-cache.h index c9a5d6a83..6bc15fdd2 100644 --- a/cogl/cogl-pipeline-cache.h +++ b/cogl/cogl-pipeline-cache.h @@ -29,10 +29,10 @@ typedef struct _CoglPipelineCache CoglPipelineCache; CoglPipelineCache * -cogl_pipeline_cache_new (void); +_cogl_pipeline_cache_new (void); void -cogl_pipeline_cache_free (CoglPipelineCache *cache); +_cogl_pipeline_cache_free (CoglPipelineCache *cache); /* * Gets a pipeline from the cache that has the same state as diff --git a/cogl/cogl.symbols b/cogl/cogl.symbols index 54ea71600..a91923079 100644 --- a/cogl/cogl.symbols +++ b/cogl/cogl.symbols @@ -516,8 +516,6 @@ cogl_perspective cogl_pipeline_add_layer_snippet cogl_pipeline_add_snippet -cogl_pipeline_cache_free -cogl_pipeline_cache_new cogl_pipeline_copy cogl_pipeline_foreach_layer cogl_pipeline_get_alpha_test_function