From c2b6a631307d65ca809a51c29f0d8e6c62667d76 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 1 Jun 2017 12:35:34 +0200 Subject: [PATCH] mesa: rename texsubimage() to texsubimage_err() Signed-off-by: Samuel Pitoiset Reviewed-by: Timothy Arceri --- src/mesa/main/teximage.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index fed1dad2621..9285a96b688 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -3238,11 +3238,11 @@ _mesa_texture_sub_image(struct gl_context *ctx, GLuint dims, * Must split this out this way because of GL_TEXTURE_CUBE_MAP. */ static void -texsubimage(struct gl_context *ctx, GLuint dims, GLenum target, GLint level, - GLint xoffset, GLint yoffset, GLint zoffset, - GLsizei width, GLsizei height, GLsizei depth, - GLenum format, GLenum type, const GLvoid *pixels, - const char *callerName) +texsubimage_err(struct gl_context *ctx, GLuint dims, GLenum target, GLint level, + GLint xoffset, GLint yoffset, GLint zoffset, + GLsizei width, GLsizei height, GLsizei depth, + GLenum format, GLenum type, const GLvoid *pixels, + const char *callerName) { struct gl_texture_object *texObj; struct gl_texture_image *texImage; @@ -3402,10 +3402,10 @@ _mesa_TexSubImage1D( GLenum target, GLint level, const GLvoid *pixels ) { GET_CURRENT_CONTEXT(ctx); - texsubimage(ctx, 1, target, level, - xoffset, 0, 0, - width, 1, 1, - format, type, pixels, "glTexSubImage1D"); + texsubimage_err(ctx, 1, target, level, + xoffset, 0, 0, + width, 1, 1, + format, type, pixels, "glTexSubImage1D"); } @@ -3417,10 +3417,10 @@ _mesa_TexSubImage2D( GLenum target, GLint level, const GLvoid *pixels ) { GET_CURRENT_CONTEXT(ctx); - texsubimage(ctx, 2, target, level, - xoffset, yoffset, 0, - width, height, 1, - format, type, pixels, "glTexSubImage2D"); + texsubimage_err(ctx, 2, target, level, + xoffset, yoffset, 0, + width, height, 1, + format, type, pixels, "glTexSubImage2D"); } @@ -3433,10 +3433,10 @@ _mesa_TexSubImage3D( GLenum target, GLint level, const GLvoid *pixels ) { GET_CURRENT_CONTEXT(ctx); - texsubimage(ctx, 3, target, level, - xoffset, yoffset, zoffset, - width, height, depth, - format, type, pixels, "glTexSubImage3D"); + texsubimage_err(ctx, 3, target, level, + xoffset, yoffset, zoffset, + width, height, depth, + format, type, pixels, "glTexSubImage3D"); } void GLAPIENTRY -- 2.30.2