diff options
| author | Eric Anholt <eric@anholt.net> | 2007-07-05 11:36:44 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-07-05 11:36:44 -0700 |
| commit | 3cf20ddbfc9d3a1dad4c058050595c54589257d3 (patch) | |
| tree | 57de53410bb0fb40979eed20d3c80d4c0ed68664 /src/mesa/drivers/dri/i915tex/intel_tex_image.c | |
| parent | 2ac17c68e2d64260168a54a275e839775828f534 (diff) | |
| parent | 4fe48b4e8568896cdbc822323aeec0a41c72ff2a (diff) | |
Merge branch 'i915-unification' of git+ssh://people.freedesktop.org/~anholt/mesa into i915-unification
Diffstat (limited to 'src/mesa/drivers/dri/i915tex/intel_tex_image.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915tex/intel_tex_image.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i915tex/intel_tex_image.c b/src/mesa/drivers/dri/i915tex/intel_tex_image.c index b15569681a..197cf35ebe 100644 --- a/src/mesa/drivers/dri/i915tex/intel_tex_image.c +++ b/src/mesa/drivers/dri/i915tex/intel_tex_image.c @@ -377,9 +377,6 @@ intelTexImage(GLcontext * ctx, assert(!intelObj->mt); } - if (!pixels) - return; - if (!intelObj->mt) { guess_and_alloc_mipmap_tree(intel, intelObj, intelImage); if (!intelObj->mt) { @@ -681,6 +678,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; |