mesa: inline _mesa_finish()

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index b801322fd02d226ab412ae2d4d639761139895e1..3057a92ecac827815adc7897758ce3e800505705 100644 (file)
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1833,20 +1833,6 @@ _mesa_record_error(struct gl_context *ctx, GLenum error)
 }
 
 
-/**
- * Flush commands and wait for completion.
- */
-void
-_mesa_finish(struct gl_context *ctx)
-{
-   FLUSH_VERTICES( ctx, 0 );
-   FLUSH_CURRENT( ctx, 0 );
-   if (ctx->Driver.Finish) {
-      ctx->Driver.Finish(ctx);
-   }
-}
-
-
 /**
  * Flush commands.
  */
@@ -1863,7 +1849,7 @@ _mesa_flush(struct gl_context *ctx)
 
 
 /**
- * Execute glFinish().
+ * Flush commands and wait for completion.
  *
  * Calls the #ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH macro and the
  * dd_function_table::Finish driver callback, if not NULL.
@@ -1873,7 +1859,13 @@ _mesa_Finish(void)
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
-   _mesa_finish(ctx);
+
+   FLUSH_VERTICES(ctx, 0);
+   FLUSH_CURRENT(ctx, 0);
+
+   if (ctx->Driver.Finish) {
+      ctx->Driver.Finish(ctx);
+   }
 }
 
 

diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index ccb54635defc47f8eb552e18202bb7c22acf7ece..4f75f577135fe38b515959d8a30a336725d08861 100644 (file)
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -161,9 +161,6 @@ extern void
 _mesa_record_error( struct gl_context *ctx, GLenum error );
 
 
-extern void
-_mesa_finish(struct gl_context *ctx);
-
 extern void
 _mesa_flush(struct gl_context *ctx);