nouveau: nv30: fix miptree organization to have swizzled texture+mipmap at the right...

diff --git a/src/gallium/drivers/nv30/nv30_miptree.c b/src/gallium/drivers/nv30/nv30_miptree.c
index 23f88293219b56b6458f3cf00660b69f37c56284..fe13f50ebb35bd1a6fb97a569fd039563d4f3899 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_miptree.c
+++ b/src/gallium/drivers/nv30/nv30_miptree.c
@@ -8,10 +8,14 @@ static void
 nv30_miptree_layout(struct nv30_miptree *nv30mt)
 {
        struct pipe_texture *pt = &nv30mt->base;
-       boolean swizzled = FALSE;
        uint width = pt->width[0], height = pt->height[0], depth = pt->depth[0];
        uint offset = 0;
-       int nr_faces, l, f, pitch;
+       int nr_faces, l, f;
+       uint wide_pitch = pt->tex_usage & (PIPE_TEXTURE_USAGE_SAMPLER |
+                                          PIPE_TEXTURE_USAGE_DEPTH_STENCIL |
+                                          PIPE_TEXTURE_USAGE_RENDER_TARGET |
+                                          PIPE_TEXTURE_USAGE_DISPLAY_TARGET |
+                                          PIPE_TEXTURE_USAGE_PRIMARY);
 
        if (pt->target == PIPE_TEXTURE_CUBE) {
                nr_faces = 6;
@@ -22,7 +26,6 @@ nv30_miptree_layout(struct nv30_miptree *nv30mt)
                nr_faces = 1;
        }
 
-       pitch = pt->width[0];
        for (l = 0; l <= pt->last_level; l++) {
                pt->width[l] = width;
                pt->height[l] = height;
@@ -30,11 +33,11 @@ nv30_miptree_layout(struct nv30_miptree *nv30mt)
                pt->nblocksx[l] = pf_get_nblocksx(&pt->block, width);
                pt->nblocksy[l] = pf_get_nblocksy(&pt->block, height);
 
-               if (swizzled)
-                       pitch = pt->nblocksx[l];
-               pitch = align(pitch, 64);
+               if (wide_pitch && (pt->tex_usage & NOUVEAU_TEXTURE_USAGE_LINEAR))
+                       nv30mt->level[l].pitch = align(pt->width[0] * pt->block.size, 64);
+               else
+                       nv30mt->level[l].pitch = pt->width[l] * pt->block.size;
 
-               nv30mt->level[l].pitch = pitch * pt->block.size;
                nv30mt->level[l].image_offset =
                        CALLOC(nr_faces, sizeof(unsigned));
 
@@ -44,10 +47,17 @@ nv30_miptree_layout(struct nv30_miptree *nv30mt)
        }
 
        for (f = 0; f < nr_faces; f++) {
-               for (l = 0; l <= pt->last_level; l++) {
+               for (l = 0; l < pt->last_level; l++) {
                        nv30mt->level[l].image_offset[f] = offset;
-                       offset += nv30mt->level[l].pitch * pt->height[l];
+
+                       if (!(pt->tex_usage & NOUVEAU_TEXTURE_USAGE_LINEAR))
+                               offset += align(nv30mt->level[l].pitch * pt->height[l], 64);
+                       else
+                               offset += nv30mt->level[l].pitch * pt->height[l];
                }
+
+               nv30mt->level[l].image_offset[f] = offset;
+               offset += nv30mt->level[l].pitch * pt->height[l];
        }
 
        nv30mt->total_size = offset;
@@ -74,7 +84,8 @@ nv30_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
                mt->base.tex_usage |= NOUVEAU_TEXTURE_USAGE_LINEAR;
        else
        if (pt->tex_usage & (PIPE_TEXTURE_USAGE_PRIMARY |
-                            PIPE_TEXTURE_USAGE_DISPLAY_TARGET))
++                           PIPE_TEXTURE_USAGE_DISPLAY_TARGET |
++                           PIPE_TEXTURE_USAGE_DEPTH_STENCIL))
                mt->base.tex_usage |= NOUVEAU_TEXTURE_USAGE_LINEAR;
        else
        if (pt->tex_usage & PIPE_TEXTURE_USAGE_DYNAMIC)
@@ -85,7 +96,11 @@ nv30_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
                case PIPE_FORMAT_A8R8G8B8_UNORM:
                case PIPE_FORMAT_X8R8G8B8_UNORM:
                case PIPE_FORMAT_R16_SNORM:
-                       break;
+               {
+                       if (debug_get_bool_option("NOUVEAU_NO_SWIZZLE", FALSE))
+                               mt->base.tex_usage |= NOUVEAU_TEXTURE_USAGE_LINEAR;
+                       break;
+               }
                default:
                        mt->base.tex_usage |= NOUVEAU_TEXTURE_USAGE_LINEAR;
                }
@@ -148,8 +163,8 @@ nv30_miptree_release(struct pipe_screen *pscreen, struct pipe_texture **ppt)
        }
 
        if (mt->shadow_tex) {
-               assert(mt->shadow_surface);
-               pscreen->tex_surface_release(pscreen, &mt->shadow_surface);
+               if (mt->shadow_surface)
+                       pscreen->tex_surface_release(pscreen, &mt->shadow_surface);
                nv30_miptree_release(pscreen, &mt->shadow_tex);
        }
 

diff --git a/src/gallium/drivers/nv30/nv30_screen.c b/src/gallium/drivers/nv30/nv30_screen.c
index e3c9b420448d8fe955f79fb0a79ef7593df75132..c97a73f0b1a5c7c1fc9ca240379957053a576ad2 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_screen.c
+++ b/src/gallium/drivers/nv30/nv30_screen.c
@@ -206,6 +206,8 @@ nv30_surface_unmap(struct pipe_screen *screen, struct pipe_surface *surface)
                nvscreen->eng2d->copy(nvscreen->eng2d, surface, 0, 0,
                                      surface_to_unmap, 0, 0,
                                      surface->width, surface->height);
+
+               screen->tex_surface_release(screen, &surface_to_unmap);
        }
 }