Mesa (master): st/mesa: set stObj->lastLevel in guess_and_alloc_texture
Vadim Girlin
vadimg at kemper.freedesktop.org
Wed May 23 02:11:17 UTC 2012
Module: Mesa
Branch: master
Commit: c91b4edff978ee19afb4fe38ad69efc52db90691
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c91b4edff978ee19afb4fe38ad69efc52db90691
Author: Vadim Girlin <vadimgirlin at gmail.com>
Date: Wed May 23 06:07:00 2012 +0400
st/mesa: set stObj->lastLevel in guess_and_alloc_texture
Fixes lockups/asserts with depthstencil-render-miplevels tests and r600g.
Should also fix https://bugs.freedesktop.org/show_bug.cgi?id=50033
NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Vadim Girlin <vadimgirlin at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
---
src/mesa/state_tracker/st_cb_texture.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index f9c190a..b24f9a1 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -400,6 +400,8 @@ guess_and_alloc_texture(struct st_context *st,
ptLayers,
bindings);
+ stObj->lastLevel = lastLevel;
+
DBG("%s returning %d\n", __FUNCTION__, (stObj->pt != NULL));
return stObj->pt != NULL;
More information about the mesa-commit
mailing list