diff options
author | Ian Romanick <[email protected]> | 2017-12-12 09:05:46 -0800 |
---|---|---|
committer | Ian Romanick <[email protected]> | 2018-01-02 16:23:50 -0800 |
commit | d80be517750ba5e89432f962175bf996a6f52ce0 (patch) | |
tree | b42633fb30e9a3e5d9e7035f619facbb04c83cc4 /src/mesa | |
parent | 0158565924564ec2edca7acd0ccbc33a369ea50d (diff) |
mesa: Fold _mesa_record_error into its only caller
Also, the comment on _mesa_record_error was wrong.
dd_function_table::Error was not called because that function does not
exist.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Tapani Pälli <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/main/context.c | 25 | ||||
-rw-r--r-- | src/mesa/main/context.h | 4 | ||||
-rw-r--r-- | src/mesa/main/errors.c | 3 |
3 files changed, 2 insertions, 30 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 3fa9f69f883..53261fea51b 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1829,31 +1829,6 @@ _mesa_get_dispatch(struct gl_context *ctx) /** \name Miscellaneous functions */ /**********************************************************************/ /*@{*/ - -/** - * Record an error. - * - * \param ctx GL context. - * \param error error code. - * - * Records the given error code and call the driver's dd_function_table::Error - * function if defined. - * - * \sa - * This is called via _mesa_error(). - */ -void -_mesa_record_error(struct gl_context *ctx, GLenum error) -{ - if (!ctx) - return; - - if (ctx->ErrorValue == GL_NO_ERROR) { - ctx->ErrorValue = error; - } -} - - /** * Flush commands. */ diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h index 309d25cf3b8..17fb86c3239 100644 --- a/src/mesa/main/context.h +++ b/src/mesa/main/context.h @@ -154,10 +154,6 @@ _mesa_set_context_lost_dispatch(struct gl_context *ctx); /*@{*/ extern void -_mesa_record_error( struct gl_context *ctx, GLenum error ); - - -extern void _mesa_flush(struct gl_context *ctx); extern void GLAPIENTRY diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c index 35a2f66c31c..a9687913627 100644 --- a/src/mesa/main/errors.c +++ b/src/mesa/main/errors.c @@ -327,7 +327,8 @@ _mesa_error( struct gl_context *ctx, GLenum error, const char *fmtString, ... ) } /* Set the GL context error state for glGetError. */ - _mesa_record_error(ctx, error); + if (ctx->ErrorValue == GL_NO_ERROR) + ctx->ErrorValue = error; } void |