fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 02:50:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: check that internalformat of CopyTexImage*D is not 1, 2, 3, 4

Browse source 
The piglit copyteximage check has recently been augmented to test this, but
apparently it hasn't been fixed in Mesa so far.

This language also already appears in the OpenGL 2.1 spec (Ian).

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Nicolai Hähnle 2016-01-07 15:27:52 -05:00
parent 040e314143
commit d6db7ceedf
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/mesa/main/teximage.c
View file

@ -2247,6 +2247,22 @@ copytexture_error_check( struct gl_context *ctx, GLuint dimensions,
_mesa_enum_to_string(internalFormat));
return GL_TRUE;
}
} else {
/*
* Section 8.6 (Alternate Texture Image Specification Commands) of the
* OpenGL 4.5 (Compatibility Profile) spec says:
*
* "Parameters level, internalformat, and border are specified using
* the same values, with the same meanings, as the corresponding
* arguments of TexImage2D, except that internalformat may not be
* specified as 1, 2, 3, or 4."
*/
if (internalFormat >= 1 && internalFormat <= 4) {
_mesa_error(ctx, GL_INVALID_ENUM,
"glCopyTexImage%dD(internalFormat=%d)", dimensions,
internalFormat);
return GL_TRUE;
}
}
baseFormat = _mesa_base_tex_format(ctx, internalFormat);