From: Fredrik Höglund <fredrik@kde.org>
Date: Thu, 6 Jan 2011 22:12:08 +0000 (+0100)
Subject: st/mesa: fix a regression from cae2bb76
X-Git-Tag: mesa-7.11-rc1~2783
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=71b889f904fcba4fbc5aafff4cb62a7201f38075;p=platform%2Fupstream%2Fmesa.git

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>
---

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 14d33f7..09a10ba 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);
    }