Mesa (master): mesa: rename ScissorIndexed() to scissor_indexed_err()
Samuel Pitoiset
hakzsam at kemper.freedesktop.org
Wed Jun 7 07:11:36 UTC 2017
Module: Mesa
Branch: master
Commit: 80ae5c128d994b8c8103a8ba3b096837b248646d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=80ae5c128d994b8c8103a8ba3b096837b248646d
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date: Tue Jun 6 21:58:27 2017 +0200
mesa: rename ScissorIndexed() to scissor_indexed_err()
And move GET_CURRENT_CONTEXT() into the APIENTRY calls
for consistency.
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
---
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 0dd956c9e3..5cf02168bd 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
More information about the mesa-commit
mailing list