diff options
author | Samuel Pitoiset <[email protected]> | 2017-07-20 11:52:56 +0200 |
---|---|---|
committer | Samuel Pitoiset <[email protected]> | 2017-07-20 16:14:20 +0200 |
commit | f95420d74effae98f02d56cb680556f96b82059f (patch) | |
tree | 2ab5a57f10456dce9ff5e668910f46dce884cfa4 /src/mesa/main | |
parent | 9f9441535a74a16b49e7f52846e0cdbfb1e7dc87 (diff) |
mesa: pass the 'caller' function to texstorage()
To be consistent with texturestorage().
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r-- | src/mesa/main/texstorage.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/mesa/main/texstorage.c b/src/mesa/main/texstorage.c index 7519ca2807a..99a169e5ff9 100644 --- a/src/mesa/main/texstorage.c +++ b/src/mesa/main/texstorage.c @@ -475,7 +475,7 @@ texture_storage(struct gl_context *ctx, GLuint dims, */ static void texstorage(GLuint dims, GLenum target, GLsizei levels, GLenum internalformat, - GLsizei width, GLsizei height, GLsizei depth) + GLsizei width, GLsizei height, GLsizei depth, const char *caller) { struct gl_texture_object *texObj; GET_CURRENT_CONTEXT(ctx); @@ -485,14 +485,13 @@ texstorage(GLuint dims, GLenum target, GLsizei levels, GLenum internalformat, */ if (!legal_texobj_target(ctx, dims, target)) { _mesa_error(ctx, GL_INVALID_ENUM, - "glTexStorage%uD(illegal target=%s)", - dims, _mesa_enum_to_string(target)); + "%s(illegal target=%s)", + caller, _mesa_enum_to_string(target)); return; } if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE)) - _mesa_debug(ctx, "glTexStorage%uD %s %d %s %d %d %d\n", - dims, + _mesa_debug(ctx, "%s %s %d %s %d %d %d\n", caller, _mesa_enum_to_string(target), levels, _mesa_enum_to_string(internalformat), width, height, depth); @@ -500,7 +499,7 @@ texstorage(GLuint dims, GLenum target, GLsizei levels, GLenum internalformat, /* Check the format to make sure it is sized. */ if (!_mesa_is_legal_tex_storage_format(ctx, internalformat)) { _mesa_error(ctx, GL_INVALID_ENUM, - "glTexStorage%uD(internalformat = %s)", dims, + "%s(internalformat = %s)", caller, _mesa_enum_to_string(internalformat)); return; } @@ -562,7 +561,8 @@ void GLAPIENTRY _mesa_TexStorage1D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width) { - texstorage(1, target, levels, internalformat, width, 1, 1); + texstorage(1, target, levels, internalformat, width, 1, 1, + "glTexStorage1D"); } @@ -570,7 +570,8 @@ void GLAPIENTRY _mesa_TexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height) { - texstorage(2, target, levels, internalformat, width, height, 1); + texstorage(2, target, levels, internalformat, width, height, 1, + "glTexStorage2D"); } @@ -578,7 +579,8 @@ void GLAPIENTRY _mesa_TexStorage3D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth) { - texstorage(3, target, levels, internalformat, width, height, depth); + texstorage(3, target, levels, internalformat, width, height, depth, + "glTexStorage3D"); } |