From 74fe57b01859b20f03eda848553538824cd4baa1 Mon Sep 17 00:00:00 2001 From: Fernando Monteiro Date: Thu, 16 Sep 2021 22:24:58 +0100 Subject: [PATCH] cogl: Remove deprecated depth_test API They are unused. Part-of: --- cogl/cogl/cogl-context-private.h | 2 -- cogl/cogl/cogl-context.c | 2 -- cogl/cogl/cogl-framebuffer.h | 4 ---- cogl/cogl/cogl.c | 20 -------------------- cogl/cogl/cogl1-context.h | 29 ----------------------------- 5 files changed, 57 deletions(-) diff --git a/cogl/cogl/cogl-context-private.h b/cogl/cogl/cogl-context-private.h index 5856f76e9..4702fb4d0 100644 --- a/cogl/cogl/cogl-context-private.h +++ b/cogl/cogl/cogl-context-private.h @@ -162,8 +162,6 @@ struct _CoglContext float depth_range_near_cache; float depth_range_far_cache; - gboolean legacy_depth_test_enabled; - CoglBuffer *current_buffer[COGL_BUFFER_BIND_TARGET_COUNT]; /* Framebuffers */ diff --git a/cogl/cogl/cogl-context.c b/cogl/cogl/cogl-context.c index 25fdfa7fa..26c12e9f8 100644 --- a/cogl/cogl/cogl-context.c +++ b/cogl/cogl/cogl-context.c @@ -277,8 +277,6 @@ cogl_context_new (CoglDisplay *display, context->depth_range_near_cache = 0; context->depth_range_far_cache = 1; - context->legacy_depth_test_enabled = FALSE; - context->pipeline_cache = _cogl_pipeline_cache_new (); for (i = 0; i < COGL_BUFFER_BIND_TARGET_COUNT; i++) diff --git a/cogl/cogl/cogl-framebuffer.h b/cogl/cogl/cogl-framebuffer.h index 571b48998..e0848e45c 100644 --- a/cogl/cogl/cogl-framebuffer.h +++ b/cogl/cogl/cogl-framebuffer.h @@ -1061,10 +1061,6 @@ cogl_framebuffer_clear4f (CoglFramebuffer *framebuffer, * a GPU such as #CoglTexture2D are associated with layers of the given * @pipeline. * - * This api doesn't support any of the legacy global state options such - * as cogl_set_depth_test_enabled() or - * cogl_set_backface_culling_enabled(). - * * Stability: unstable * Since: 1.10 * Deprecated: 1.16: Use #CoglPrimitives and diff --git a/cogl/cogl/cogl.c b/cogl/cogl/cogl.c index 807594f1b..562b40d9b 100644 --- a/cogl/cogl/cogl.c +++ b/cogl/cogl/cogl.c @@ -73,26 +73,6 @@ _cogl_check_extension (const char *name, char * const *ext) return FALSE; } -/* XXX: This API has been deprecated */ -void -cogl_set_depth_test_enabled (gboolean setting) -{ - _COGL_GET_CONTEXT (ctx, NO_RETVAL); - - if (ctx->legacy_depth_test_enabled == setting) - return; - - ctx->legacy_depth_test_enabled = setting; -} - -/* XXX: This API has been deprecated */ -gboolean -cogl_get_depth_test_enabled (void) -{ - _COGL_GET_CONTEXT (ctx, FALSE); - return ctx->legacy_depth_test_enabled; -} - void cogl_set_backface_culling_enabled (gboolean setting) { diff --git a/cogl/cogl/cogl1-context.h b/cogl/cogl/cogl1-context.h index 755a48452..50a07ae90 100644 --- a/cogl/cogl/cogl1-context.h +++ b/cogl/cogl/cogl1-context.h @@ -79,35 +79,6 @@ cogl_get_option_group (void); COGL_EXPORT GCallback cogl_get_proc_address (const char *name); -/** - * cogl_set_depth_test_enabled: - * @setting: %TRUE to enable depth testing or %FALSE to disable. - * - * Sets whether depth testing is enabled. If it is disabled then the - * order that actors are layered on the screen depends solely on the - * order specified using clutter_actor_raise() and - * clutter_actor_lower(), otherwise it will also take into account the - * actor's depth. Depth testing is disabled by default. - * - * Deprecated: 1.16: Use cogl_pipeline_set_depth_state() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_set_depth_state) -COGL_EXPORT void -cogl_set_depth_test_enabled (gboolean setting); - -/** - * cogl_get_depth_test_enabled: - * - * Queries if depth testing has been enabled via cogl_set_depth_test_enable() - * - * Return value: %TRUE if depth testing is enabled, and %FALSE otherwise - * - * Deprecated: 1.16: Use cogl_pipeline_set_depth_state() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_set_depth_state) -COGL_EXPORT gboolean -cogl_get_depth_test_enabled (void); - /** * cogl_set_backface_culling_enabled: * @setting: %TRUE to enable backface culling or %FALSE to disable.