diff options
| author | Fredrik Höglund <fredrik@kde.org> | 2011-01-06 23:12:08 +0100 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2011-01-13 01:22:20 -0500 |
| commit | 71b889f904fcba4fbc5aafff4cb62a7201f38075 (patch) | |
| tree | 0437212a7e39da3a7c299519128fc12459ca2449 /src/mesa/state_tracker | |
| parent | bd2b72359ed504434692d7464602c780a322c61e (diff) | |
st/mesa: fix a regression from cae2bb76
stObj->pt is null when a TFP texture is passed to st_finalize_texture,
and with the changes introduced in the above commit this resulted in a
new texture being created and the existing image being copied into it.
NOTE: This is a candidate for the 7.10 branch.
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Diffstat (limited to 'src/mesa/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 14d33f7b49..09a10ba581 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -1858,9 +1858,8 @@ st_finalize_texture(struct gl_context *ctx, * will match. */ if (firstImage->pt && - stObj->pt && firstImage->pt != stObj->pt && - firstImage->pt->last_level >= stObj->pt->last_level) { + (!stObj->pt || firstImage->pt->last_level >= stObj->pt->last_level)) { pipe_resource_reference(&stObj->pt, firstImage->pt); pipe_sampler_view_reference(&stObj->sampler_view, NULL); } |