From 80ae5c128d994b8c8103a8ba3b096837b248646d Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 6 Jun 2017 21:58:27 +0200 Subject: [PATCH] mesa: rename ScissorIndexed() to scissor_indexed_err() And move GET_CURRENT_CONTEXT() into the APIENTRY calls for consistency. Signed-off-by: Samuel Pitoiset Reviewed-by: Timothy Arceri --- src/mesa/main/scissor.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/mesa/main/scissor.c b/src/mesa/main/scissor.c index 0dd956c9e3d..5cf02168bdd 100644 --- a/src/mesa/main/scissor.c +++ b/src/mesa/main/scissor.c @@ -169,11 +169,10 @@ _mesa_ScissorArrayv(GLuint first, GLsizei count, const GLint *v) * Verifies the parameters call set_scissor_no_notify to do the work. */ static void -ScissorIndexed(GLuint index, GLint left, GLint bottom, - GLsizei width, GLsizei height, const char *function) +scissor_indexed_err(struct gl_context *ctx, GLuint index, GLint left, + GLint bottom, GLsizei width, GLsizei height, + const char *function) { - GET_CURRENT_CONTEXT(ctx); - if (MESA_VERBOSE & VERBOSE_API) _mesa_debug(ctx, "%s(%d, %d, %d, %d, %d)\n", function, index, left, bottom, width, height); @@ -199,13 +198,17 @@ void GLAPIENTRY _mesa_ScissorIndexed(GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height) { - ScissorIndexed(index, left, bottom, width, height, "glScissorIndexed"); + GET_CURRENT_CONTEXT(ctx); + scissor_indexed_err(ctx, index, left, bottom, width, height, + "glScissorIndexed"); } void GLAPIENTRY _mesa_ScissorIndexedv(GLuint index, const GLint *v) { - ScissorIndexed(index, v[0], v[1], v[2], v[3], "glScissorIndexedv"); + GET_CURRENT_CONTEXT(ctx); + scissor_indexed_err(ctx, index, v[0], v[1], v[2], v[3], + "glScissorIndexedv"); } void GLAPIENTRY -- 2.30.2