projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_5_branch'
[mesa.git]
/
src
/
gallium
/
drivers
/
nv04
/
nv04_miptree.c
diff --git
a/src/gallium/drivers/nv04/nv04_miptree.c
b/src/gallium/drivers/nv04/nv04_miptree.c
index 85dc017fbc4260b4aeaf6186811743e002319266..93f752faec90c135e7b4e38f313b9a2bee4b3197 100644
(file)
--- a/
src/gallium/drivers/nv04/nv04_miptree.c
+++ b/
src/gallium/drivers/nv04/nv04_miptree.c
@@
-31,7
+31,8
@@
nv04_miptree_layout(struct nv04_miptree *nv04mt)
for (l = 0; l <= pt->last_level; l++) {
for (l = 0; l <= pt->last_level; l++) {
- nv04mt->level[l].image_offset = offset;
+ nv04mt->level[l].image_offset =
+ CALLOC(nr_faces, sizeof(unsigned));
offset += nv04mt->level[l].pitch * pt->height[l];
}
offset += nv04mt->level[l].pitch * pt->height[l];
}
@@
-122,7
+123,6
@@
nv04_miptree_surface_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
ns->base.width = pt->width[level];
ns->base.height = pt->height[level];
ns->base.usage = flags;
ns->base.width = pt->width[level];
ns->base.height = pt->height[level];
ns->base.usage = flags;
- ns->base.status = PIPE_SURFACE_STATUS_DEFINED;
pipe_reference_init(&ns->base.reference, 1);
ns->base.face = face;
ns->base.level = level;
pipe_reference_init(&ns->base.reference, 1);
ns->base.face = face;
ns->base.level = level;