Fix glBindTexture crash (bug 14514)

This commit is contained in:
Brian 2008-02-15 13:41:21 -07:00
parent c5f8ff8b32
commit bf97ca448c
2 changed files with 4 additions and 1 deletions

View file

@ -35,6 +35,7 @@ Mesa 7.0.3 is a stable release with bug fixes since version 7.0.2.
<li>Fixed GLX indirect vertex array rendering bug (14197)
<li>Fixed crash when deleting framebuffer objects (bugs 13507, 14293)
<li>User-defined clip planes enabled for R300 (bug 9871)
<li>Fixed glBindTexture() crash upon bad target (bug 14514)
</ul>

View file

@ -854,7 +854,8 @@ _mesa_BindTexture( GLenum target, GLuint texName )
newTexObj = ctx->Shared->DefaultRect;
break;
default:
; /* Bad targets are caught above */
_mesa_error(ctx, GL_INVALID_ENUM, "glBindTexture(target)");
return;
}
}
else {
@ -926,6 +927,7 @@ _mesa_BindTexture( GLenum target, GLuint texName )
_mesa_reference_texobj(&texUnit->CurrentRect, newTexObj);
break;
default:
/* Bad target should be caught above */
_mesa_problem(ctx, "bad target in BindTexture");
return;
}