summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorTimothy Arceri <tarceri@itsqueeze.com>2017-06-28 14:20:48 +1000
committerTimothy Arceri <tarceri@itsqueeze.com>2017-06-29 08:54:11 +1000
commitcc88eb97e08070fb5b599c0dd3f3d3cc0b88f9a1 (patch)
tree761e007753513a98226f658957bd9ee238bcba59 /src/mesa
parentd8143a4bde01dcbef7d5099fcdde6a810ca2d99a (diff)
mesa: inline _mesa_finish()
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/context.c24
-rw-r--r--src/mesa/main/context.h3
2 files changed, 8 insertions, 19 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index b801322fd02..3057a92ecac 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1834,20 +1834,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.
*/
void
@@ -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 ccb54635def..4f75f577135 100644
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -162,9 +162,6 @@ _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);
extern void GLAPIENTRY