fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 07:18:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

teximage: use _mesa_es3_error_check_format_and_type for GLES3

Browse source 
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Matt Turner 2012-12-06 14:51:29 -08:00 • committed by Jordan Justen
parent 9cfcac4528
commit f5a3d151b0
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1893,23 +1893,30 @@ texture_error_check( struct gl_context *ctx,
* requires GL_OES_texture_float) are filtered elsewhere.
*/
if (_mesa_is_gles(ctx) && !_mesa_is_gles3(ctx)) {
if (format != internalFormat) {
if (_mesa_is_gles(ctx)) {
if (_mesa_is_gles3(ctx)) {
err = _mesa_es3_error_check_format_and_type(format, type,
internalFormat,
dimensions);
} else {
if (format != internalFormat) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glTexImage%dD(format = %s, internalFormat = %s)",
dimensions,
_mesa_lookup_enum_by_nr(format),
_mesa_lookup_enum_by_nr(internalFormat));
return GL_TRUE;
}
}
err = _mesa_es_error_check_format_and_type(format, type, dimensions);
err = _mesa_es_error_check_format_and_type(format, type, dimensions);
}
if (err != GL_NO_ERROR) {
_mesa_error(ctx, err,
"glTexImage%dD(format = %s, type = %s)",
"glTexImage%dD(format = %s, type = %s, internalFormat = %s)",
dimensions,
_mesa_lookup_enum_by_nr(format),
_mesa_lookup_enum_by_nr(type));
_mesa_lookup_enum_by_nr(type),
_mesa_lookup_enum_by_nr(internalFormat));
return GL_TRUE;
}
}