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

mesa: fix assertion failure in TexImage 

Check the assertion after error checking.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111194

Fixes: 9dd1f7cec0 ("mesa: pass gl_texture_object as arg to not depend on state")
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Marek Olšák 2019-07-22 15:28:42 -04:00 committed by Kenneth Graunke
parent 5c5f11d1dd
commit c37df5feaa
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2979,6 +2979,9 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
internalFormat = override_internal_format(internalFormat, width, height);
if (!texObj)
texObj = _mesa_get_current_tex_object(ctx, target);
if (!no_error) {
/* target error checking */
if (!legal_teximage_target(ctx, dims, target)) {
@ -3001,6 +3004,7 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
return;
}
}
assert(texObj);
/* Here we convert a cpal compressed image into a regular glTexImage2D
* call by decompressing the texture. If we really want to support cpal
@ -3160,10 +3164,7 @@ teximage_err(struct gl_context *ctx, GLboolean compressed, GLuint dims,
GLint border, GLenum format, GLenum type,
GLsizei imageSize, const GLvoid *pixels)
{
struct gl_texture_object* texObj = _mesa_get_current_tex_object(ctx, target);
assert(texObj);
teximage(ctx, compressed, dims, texObj, target, level, internalFormat, width, height,
teximage(ctx, compressed, dims, NULL, target, level, internalFormat, width, height,
depth, border, format, type, imageSize, pixels, false);
}
@ -3175,10 +3176,7 @@ teximage_no_error(struct gl_context *ctx, GLboolean compressed, GLuint dims,
GLint border, GLenum format, GLenum type,
GLsizei imageSize, const GLvoid *pixels)
{
struct gl_texture_object* texObj = _mesa_get_current_tex_object(ctx, target);
assert(texObj);
teximage(ctx, compressed, dims, texObj, target, level, internalFormat, width, height,
teximage(ctx, compressed, dims, NULL, target, level, internalFormat, width, height,
depth, border, format, type, imageSize, pixels, true);
}