Merge commit 'origin/master' into gallium-0.2

[mesa.git] / src / gallium / drivers / nv10 / nv10_miptree.c

diff --git a/src/gallium/drivers/nv10/nv10_miptree.c b/src/gallium/drivers/nv10/nv10_miptree.c
index 9a68df29250a68706dea5e33fa328e3dddbbb4e6..943f9e21e98173179f18df49a9903003e2d0663f 100644 (file)
--- a/src/gallium/drivers/nv10/nv10_miptree.c
+++ b/src/gallium/drivers/nv10/nv10_miptree.c
@@ -1,6 +1,5 @@
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_inlines.h"
 
 #include "nv10_context.h"
@@ -79,7 +78,6 @@ nv10_miptree_create(struct pipe_screen *screen, const struct pipe_texture *pt)
 static void
 nv10_miptree_release(struct pipe_screen *screen, struct pipe_texture **pt)
 {
-       struct pipe_winsys *ws = screen->winsys;
        struct pipe_texture *mt = *pt;
 
        *pt = NULL;
@@ -87,7 +85,7 @@ nv10_miptree_release(struct pipe_screen *screen, struct pipe_texture **pt)
                struct nv10_miptree *nv10mt = (struct nv10_miptree *)mt;
                int l;
 
-               pipe_buffer_reference(ws, &nv10mt->buffer, NULL);
+               pipe_buffer_reference(screen, &nv10mt->buffer, NULL);
                for (l = 0; l <= mt->last_level; l++) {
                        if (nv10mt->level[l].image_offset)
                                FREE(nv10mt->level[l].image_offset);
@@ -115,7 +113,7 @@ nv10_miptree_surface_get(struct pipe_screen *screen, struct pipe_texture *pt,
        ps = ws->surface_alloc(ws);
        if (!ps)
                return NULL;
-       pipe_buffer_reference(ws, &ps->buffer, nv10mt->buffer);
+       pipe_buffer_reference(screen, &ps->buffer, nv10mt->buffer);
        ps->format = pt->format;
        ps->width = pt->width[level];
        ps->height = pt->height[level];
@@ -123,6 +121,8 @@ nv10_miptree_surface_get(struct pipe_screen *screen, struct pipe_texture *pt,
        ps->nblocksx = pt->nblocksx[level];
        ps->nblocksy = pt->nblocksy[level];
        ps->stride = nv10mt->level[level].pitch;
+       ps->refcount = 1;
+       ps->winsys = screen->winsys;
 
        if (pt->target == PIPE_TEXTURE_CUBE) {
                ps->offset = nv10mt->level[level].image_offset[face];