Remove the context_get_current function

[fips] / context.c

diff --git a/context.c b/context.c
index 9e4979fd1b6191e98d8d50f5a89f1ca37783b640..933e1ed03207ad2e533ae0b68a6000f924a73d1f 100644 (file)
--- a/context.c
+++ b/context.c
@@ -37,7 +37,7 @@ context_create (fips_api_t api, void *system_context_id)
        fips_dispatch_init (api);
 
        metrics_info_init (&ctx->metrics_info);
-       metrics_init (&ctx->metrics);
+       ctx->metrics = metrics_create (&ctx->metrics_info);
 
        return ctx;
 }
@@ -61,8 +61,9 @@ context_enter (fips_api_t api, void *system_context_id)
 
        current_context = context_create (api, system_context_id);
 
-       metrics_set_current_op (METRICS_OP_SHADER + 0);
-       metrics_counter_start ();
+       metrics_set_current_op (current_context->metrics,
+                               METRICS_OP_SHADER + 0);
+       metrics_counter_start (current_context->metrics);
 }
 
 void
@@ -73,11 +74,35 @@ context_leave (void)
        if (ctx == NULL)
                return;
 
-       metrics_fini (&ctx->metrics);
+       metrics_destroy (ctx->metrics);
 }
 
-context_t *
-context_get_current (void)
+void
+context_counter_start (void)
+{
+       metrics_counter_start (current_context->metrics);
+}
+
+void
+context_counter_stop (void)
+{
+       metrics_counter_stop (current_context->metrics);
+}
+
+void
+context_set_current_op (metrics_op_t op)
+{
+       metrics_set_current_op (current_context->metrics, op);
+}
+
+metrics_op_t
+context_get_current_op (void)
+{
+       return metrics_get_current_op (current_context->metrics);
+}
+
+void
+context_end_frame (void)
 {
-       return current_context;
+       return metrics_end_frame (current_context->metrics);
 }