OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: inline _mesa_finish()

Browse Source 
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Timothy Arceri
2017-06-28 14:20:48 +10:00
parent d8143a4bde
commit cc88eb97e0
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/mesa/main/context.c
View File

@@ -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. * 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 * Calls the #ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH macro and the
* dd_function_table::Finish driver callback, if not NULL. * dd_function_table::Finish driver callback, if not NULL.
@@ -1873,7 +1859,13 @@ _mesa_Finish(void)
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(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);
}
} }

3
src/mesa/main/context.h
View File

@@ -161,9 +161,6 @@ extern void
_mesa_record_error( struct gl_context *ctx, GLenum error ); _mesa_record_error( struct gl_context *ctx, GLenum error );
extern void
_mesa_finish(struct gl_context *ctx);
extern void extern void
_mesa_flush(struct gl_context *ctx); _mesa_flush(struct gl_context *ctx);