Merge branch 'gallium-0.2' into gallium-winsys-private

[mesa.git] / src / gallium / drivers / nv40 / nv40_miptree.c

diff --git a/src/gallium/drivers/nv40/nv40_miptree.c b/src/gallium/drivers/nv40/nv40_miptree.c
index 38e1a5f04ca5db760041ddce5d01796dbaf30f70..6ed0d39edff6f6c7c3847452bdf3c69fbdef1532 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_miptree.c
+++ b/src/gallium/drivers/nv40/nv40_miptree.c
@@ -1,15 +1,13 @@
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_inlines.h"
 
 #include "nv40_context.h"
 
 static void
-nv40_miptree_layout(struct nv40_miptree *nv40mt)
+nv40_miptree_layout(struct nv40_miptree *mt)
 {
-       struct pipe_texture *pt = &nv40mt->base;
-       boolean swizzled = FALSE;
+       struct pipe_texture *pt = &mt->base;
        uint width = pt->width[0], height = pt->height[0], depth = pt->depth[0];
        uint offset = 0;
        int nr_faces, l, f, pitch;
@@ -31,12 +29,12 @@ nv40_miptree_layout(struct nv40_miptree *nv40mt)
                pt->nblocksx[l] = pf_get_nblocksx(&pt->block, width);
                pt->nblocksy[l] = pf_get_nblocksy(&pt->block, height);
 
-               if (swizzled)
+               if (!(pt->tex_usage & NOUVEAU_TEXTURE_USAGE_LINEAR))
                        pitch = pt->nblocksx[l];
-               pitch = align_int(pitch, 64);
+               pitch = align(pitch, 64);
 
-               nv40mt->level[l].pitch = pitch * pt->block.size;
-               nv40mt->level[l].image_offset =
+               mt->level[l].pitch = pitch * pt->block.size;
+               mt->level[l].image_offset =
                        CALLOC(nr_faces, sizeof(unsigned));
 
                width  = MAX2(1, width  >> 1);
@@ -46,12 +44,12 @@ nv40_miptree_layout(struct nv40_miptree *nv40mt)
 
        for (f = 0; f < nr_faces; f++) {
                for (l = 0; l <= pt->last_level; l++) {
-                       nv40mt->level[l].image_offset[f] = offset;
-                       offset += nv40mt->level[l].pitch * pt->height[l];
+                       mt->level[l].image_offset[f] = offset;
+                       offset += mt->level[l].pitch * pt->height[l];
                }
        }
 
-       nv40mt->total_size = offset;
+       mt->total_size = offset;
 }
 
 static struct pipe_texture *
@@ -59,6 +57,8 @@ nv40_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
 {
        struct pipe_winsys *ws = pscreen->winsys;
        struct nv40_miptree *mt;
+       unsigned buf_usage = PIPE_BUFFER_USAGE_PIXEL |
+                            NOUVEAU_BUFFER_USAGE_TEXTURE;
 
        mt = MALLOC(sizeof(struct nv40_miptree));
        if (!mt)
@@ -66,13 +66,38 @@ nv40_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
        mt->base = *pt;
        mt->base.refcount = 1;
        mt->base.screen = pscreen;
+       mt->shadow_tex = NULL;
+       mt->shadow_surface = NULL;
+
+       /* Swizzled textures must be POT */
+       if (pt->width[0] & (pt->width[0] - 1) ||
+           pt->height[0] & (pt->height[0] - 1))
+               mt->base.tex_usage |= NOUVEAU_TEXTURE_USAGE_LINEAR;
+       else
+       if (pt->tex_usage & (PIPE_TEXTURE_USAGE_PRIMARY |
+                            PIPE_TEXTURE_USAGE_DISPLAY_TARGET))
+               mt->base.tex_usage |= NOUVEAU_TEXTURE_USAGE_LINEAR;
+       else
+       if (pt->tex_usage & PIPE_TEXTURE_USAGE_DYNAMIC)
+               mt->base.tex_usage |= NOUVEAU_TEXTURE_USAGE_LINEAR;
+       else {
+               switch (pt->format) {
+               /* TODO: Figure out which formats can be swizzled */
+               case PIPE_FORMAT_A8R8G8B8_UNORM:
+               case PIPE_FORMAT_X8R8G8B8_UNORM:
+               case PIPE_FORMAT_R16_SNORM:
+                       break;
+               default:
+                       mt->base.tex_usage |= NOUVEAU_TEXTURE_USAGE_LINEAR;
+               }
+       }
+
+       if (pt->tex_usage & PIPE_TEXTURE_USAGE_DYNAMIC)
+               buf_usage |= PIPE_BUFFER_USAGE_CPU_READ_WRITE;
 
        nv40_miptree_layout(mt);
 
-       mt->buffer = ws->buffer_create(ws, 256,
-                                      PIPE_BUFFER_USAGE_PIXEL |
-                                      NOUVEAU_BUFFER_USAGE_TEXTURE,
-                                      mt->total_size);
+       mt->buffer = ws->_buffer_create(ws, 256, buf_usage, mt->total_size);
        if (!mt->buffer) {
                FREE(mt);
                return NULL;
@@ -82,23 +107,29 @@ nv40_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
 }
 
 static void
-nv40_miptree_release(struct pipe_screen *pscreen, struct pipe_texture **pt)
+nv40_miptree_release(struct pipe_screen *pscreen, struct pipe_texture **ppt)
 {
-       struct pipe_winsys *ws = pscreen->winsys;
-       struct pipe_texture *mt = *pt;
+       struct pipe_texture *pt = *ppt;
+       struct nv40_miptree *mt = (struct nv40_miptree *)pt;
+       int l;
 
-       *pt = NULL;
-       if (--mt->refcount <= 0) {
-               struct nv40_miptree *nv40mt = (struct nv40_miptree *)mt;
-               int l;
+       *ppt = NULL;
+       if (--pt->refcount)
+               return;
 
-               pipe_buffer_reference(ws, &nv40mt->buffer, NULL);
-               for (l = 0; l <= mt->last_level; l++) {
-                       if (nv40mt->level[l].image_offset)
-                               FREE(nv40mt->level[l].image_offset);
-               }
-               FREE(nv40mt);
+       pipe_buffer_reference(pscreen, &mt->buffer, NULL);
+       for (l = 0; l <= pt->last_level; l++) {
+               if (mt->level[l].image_offset)
+                       FREE(mt->level[l].image_offset);
+       }
+
+       if (mt->shadow_tex) {
+               assert(mt->shadow_surface);
+               pscreen->tex_surface_release(pscreen, &mt->shadow_surface);
+               nv40_miptree_release(pscreen, &mt->shadow_tex);
        }
+
+       FREE(mt);
 }
 
 static struct pipe_surface *
@@ -106,32 +137,35 @@ nv40_miptree_surface_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
                         unsigned face, unsigned level, unsigned zslice,
                         unsigned flags)
 {
-       struct pipe_winsys *ws = pscreen->winsys;
-       struct nv40_miptree *nv40mt = (struct nv40_miptree *)pt;
+       struct nv40_miptree *mt = (struct nv40_miptree *)pt;
        struct pipe_surface *ps;
 
        ps = CALLOC_STRUCT(pipe_surface);
        if (!ps)
                return NULL;
        pipe_texture_reference(&ps->texture, pt);
-       pipe_buffer_reference(ws, &ps->buffer, nv40mt->buffer);
+       pipe_buffer_reference(pscreen, &ps->buffer, mt->buffer);
        ps->format = pt->format;
        ps->width = pt->width[level];
        ps->height = pt->height[level];
        ps->block = pt->block;
        ps->nblocksx = pt->nblocksx[level];
        ps->nblocksy = pt->nblocksy[level];
-       ps->stride = nv40mt->level[level].pitch;
+       ps->stride = mt->level[level].pitch;
        ps->usage = flags;
        ps->status = PIPE_SURFACE_STATUS_DEFINED;
+       ps->refcount = 1;
+       ps->face = face;
+       ps->level = level;
+       ps->zslice = zslice;
 
        if (pt->target == PIPE_TEXTURE_CUBE) {
-               ps->offset = nv40mt->level[level].image_offset[face];
+               ps->offset = mt->level[level].image_offset[face];
        } else
        if (pt->target == PIPE_TEXTURE_3D) {
-               ps->offset = nv40mt->level[level].image_offset[zslice];
+               ps->offset = mt->level[level].image_offset[zslice];
        } else {
-               ps->offset = nv40mt->level[level].image_offset[0];
+               ps->offset = mt->level[level].image_offset[0];
        }
 
        return ps;
@@ -148,7 +182,7 @@ nv40_miptree_surface_del(struct pipe_screen *pscreen,
                return;
 
        pipe_texture_reference(&ps->texture, NULL);
-       pipe_buffer_reference(pscreen->winsys, &ps->buffer, NULL);
+       pipe_buffer_reference(pscreen, &ps->buffer, NULL);
        FREE(ps);
 }