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

mesa: fix invalid target error handling for teximage

Browse source 
This commit moves the target check before using _mesa_get_current_tex_object
to fix a "Mesa implementation error: bad target in _mesa_get_current_tex_object()"
error.

Fixes: 9dd1f7cec0 ("mesa: pass gl_texture_object as arg to not depend on state")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
(cherry picked from commit 16233797f4)
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2019-10-14 11:32:40 +02:00 • committed by Dylan Baker
parent 9a929cfef2
commit 5694c20188
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2979,17 +2979,18 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
internalFormat = override_internal_format(internalFormat, width, height);
if (!no_error &&
/* target error checking */
!legal_teximage_target(ctx, dims, target)) {
_mesa_error(ctx, GL_INVALID_ENUM, "%s%uD(target=%s)",
func, dims, _mesa_enum_to_string(target));
return;
}
if (!texObj)
texObj = _mesa_get_current_tex_object(ctx, target);
if (!no_error) {
/* target error checking */
if (!legal_teximage_target(ctx, dims, target)) {
_mesa_error(ctx, GL_INVALID_ENUM, "%s%uD(target=%s)",
func, dims, _mesa_enum_to_string(target));
return;
}
/* general error checking */
if (compressed) {
if (compressed_texture_error_check(ctx, dims, target, texObj,