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 <ian.d.romanick@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 3fa9f69f8837c93f1dbf889e5f5f0c37307ce510..53261fea51b26b85f928f9dbf7082c50a3579042 100644 (file)
--- 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 309d25cf3b8009e4fe978c0e7d7fd8c9ded2c5a4..17fb86c3239a1f35f478f9de7980f0a0bd5c6549 100644 (file)
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -153,10 +153,6 @@ _mesa_set_context_lost_dispatch(struct gl_context *ctx);
 /** \name Miscellaneous */
 /*@{*/
 
-extern void
-_mesa_record_error( struct gl_context *ctx, GLenum error );
-
-
 extern void
 _mesa_flush(struct gl_context *ctx);
 

diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c
index 35a2f66c31c436a03c06f6fe382cac3d4364ba8d..a9687913627a3aab0644e7f49e1dfdcde02a0479 100644 (file)
--- 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