KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: improve reported function name in Tex*Multisample 

Now that there are 4 variants, just pass the function name into
teximagemultisample rather than reconstructing it.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Chris Forbes 2013-03-16 17:00:05 +13:00
parent 9cbfe98bfc
commit b15c558c85
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/mesa/main/teximage.c
View File

@ -4196,7 +4196,7 @@ static void
teximagemultisample(GLuint dims, GLenum target, GLsizei samples,
GLint internalformat, GLsizei width, GLsizei height,
GLsizei depth, GLboolean fixedsamplelocations,
GLboolean immutable)
GLboolean immutable, const char *func)
{
struct gl_texture_object *texObj;
struct gl_texture_image *texImage;
@ -4208,12 +4208,12 @@ teximagemultisample(GLuint dims, GLenum target, GLsizei samples,
if (!(ctx->Extensions.ARB_texture_multisample
&& _mesa_is_desktop_gl(ctx))) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glTexImage%uDMultisample", dims);
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(unsupported)", func);
return;
}
if (!check_multisample_target(dims, target)) {
_mesa_error(ctx, GL_INVALID_ENUM, "glTexImage%uDMultisample(target)", dims);
_mesa_error(ctx, GL_INVALID_ENUM, "%s(target)", func);
return;
}
@ -4230,16 +4230,15 @@ teximagemultisample(GLuint dims, GLenum target, GLsizei samples,
if (!is_renderable_texture_format(ctx, internalformat)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glTexImage%uDMultisample(internalformat=%s)",
dims,
_mesa_lookup_enum_by_nr(internalformat));
"%s(internalformat=%s)",
func, _mesa_lookup_enum_by_nr(internalformat));
return;
}
sample_count_error = _mesa_check_sample_count(ctx, target,
internalformat, samples);
if (sample_count_error != GL_NO_ERROR) {
_mesa_error(ctx, sample_count_error, "glTexImage%uDMultisample(samples)", dims);
_mesa_error(ctx, sample_count_error, "%s(samples)", func);
return;
}
@ -4255,7 +4254,7 @@ teximagemultisample(GLuint dims, GLenum target, GLsizei samples,
texImage = _mesa_get_tex_image(ctx, texObj, 0, 0);
if (texImage == NULL) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage%uDMultisample()", dims);
_mesa_error(ctx, GL_OUT_OF_MEMORY, "%s()", func);
return;
}
@ -4285,20 +4284,19 @@ teximagemultisample(GLuint dims, GLenum target, GLsizei samples,
else {
if (!dimensionsOK) {
_mesa_error(ctx, GL_INVALID_VALUE,
"glTexImage%uDMultisample(invalid width or height)", dims);
"%s(invalid width or height)", func);
return;
}
if (!sizeOK) {
_mesa_error(ctx, GL_OUT_OF_MEMORY,
"glTexImage%uDMultisample(texture too large)", dims);
"%s(texture too large)", func);
return;
}
/* Check if texObj->Immutable is set */
if (texObj->Immutable) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glTexImage%uDMultisample(immutable)",
dims);
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(immutable)", func);
return;
}
@ -4334,7 +4332,7 @@ _mesa_TexImage2DMultisample(GLenum target, GLsizei samples,
GLsizei height, GLboolean fixedsamplelocations)
{
teximagemultisample(2, target, samples, internalformat,
width, height, 1, fixedsamplelocations, GL_FALSE);
width, height, 1, fixedsamplelocations, GL_FALSE, "glTexImage2DMultisample");
}
void GLAPIENTRY
@ -4344,7 +4342,7 @@ _mesa_TexImage3DMultisample(GLenum target, GLsizei samples,
GLboolean fixedsamplelocations)
{
teximagemultisample(3, target, samples, internalformat,
width, height, depth, fixedsamplelocations, GL_FALSE);
width, height, depth, fixedsamplelocations, GL_FALSE, "glTexImage3DMultisample");
}
@ -4354,7 +4352,7 @@ _mesa_TexStorage2DMultisample(GLenum target, GLsizei samples,
GLsizei height, GLboolean fixedsamplelocations)
{
teximagemultisample(2, target, samples, internalformat,
width, height, 1, fixedsamplelocations, GL_TRUE);
width, height, 1, fixedsamplelocations, GL_TRUE, "glTexStorage2DMultisample");
}
void GLAPIENTRY
@ -4364,5 +4362,5 @@ _mesa_TexStorage3DMultisample(GLenum target, GLsizei samples,
GLboolean fixedsamplelocations)
{
teximagemultisample(3, target, samples, internalformat,
width, height, depth, fixedsamplelocations, GL_TRUE);
width, height, depth, fixedsamplelocations, GL_TRUE, "glTexStorage3DMultisample");
}