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

i915tex: Better attempt to release miptree when overriding texture image.

Browse source 
The previous approach could lead to crashes in FBO code that dereferences the
miptree struct pointer unconditionally.
This commit is contained in:
Michel Dänzer 2007-06-05 19:55:53 +02:00
parent 89f070b3bb
commit 08a2cc2d23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/drivers/dri/i915tex/intel_tex_image.c
View file

@ -378,9 +378,6 @@ intelTexImage(GLcontext * ctx,
assert(!intelObj->mt);
}
if (!pixels)
return;
if (!intelObj->mt) {
guess_and_alloc_mipmap_tree(intel, intelObj, intelImage);
if (!intelObj->mt) {
@ -682,6 +679,9 @@ intelSetTexOffset(__DRIcontext *pDRICtx, GLint texname,
if (!intelObj)
return;
if (intelObj->mt)
intel_miptree_release(intel, &intelObj->mt);
intelObj->imageOverride = GL_TRUE;
intelObj->depthOverride = depth;
intelObj->pitchOverride = pitch;