From 529b7b355d392b1534ccd8ff7b428dc21cbfdc21 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 3 May 2010 13:04:29 -0600 Subject: st/mesa: restore original last_layer comparison Commit e648d4a1d1c0c5f70916e38366b863f0bec79a62 changed the original less-than test to a not-equal test. This was an effort to save some memory by switching the texture layout to a non-mipmapped layout when we mis-guessed about the original layout (thus saving some memory). However, this causes us to hit a new (apparently broken) code path when copying the old texture's data to the new texture. Simply undo this change for the time being until the other/new bug is fixed. Fixes fd.o bug 27933. --- src/mesa/state_tracker/st_cb_texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 7e2e533881..fd801a354b 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -1888,7 +1888,7 @@ st_finalize_texture(GLcontext *ctx, if (stObj->pt) { if (stObj->pt->target != gl_target_to_pipe(stObj->base.Target) || stObj->pt->format != firstImageFormat || - stObj->pt->last_level != stObj->lastLevel || + stObj->pt->last_level < stObj->lastLevel || stObj->pt->width0 != stObj->width0 || stObj->pt->height0 != stObj->height0 || stObj->pt->depth0 != stObj->depth0) -- cgit v1.2.3