1 files changed, 233 insertions, 248 deletions

diff --git a/src/gallium/drivers/nv50/nv50_miptree.c b/src/gallium/drivers/nv50/nv50_miptree.c
index 309b6503ca5..ae6b26af1eb 100644
--- a/src/gallium/drivers/nv50/nv50_miptree.c
+++ b/src/gallium/drivers/nv50/nv50_miptree.c
@@ -29,300 +29,285 @@
 #include "nv50_resource.h"
 #include "nv50_transfer.h"
 
-/* The restrictions in tile mode selection probably aren't necessary. */
 static INLINE uint32_t
-get_tile_mode(unsigned ny, unsigned d)
+get_tile_dims(unsigned nx, unsigned ny, unsigned nz)
 {
-	uint32_t tile_mode = 0x00;
-
-	if (ny > 32) tile_mode = 0x04; /* height 64 tiles */
-	else
-	if (ny > 16) tile_mode = 0x03; /* height 32 tiles */
-	else
-	if (ny >  8) tile_mode = 0x02; /* height 16 tiles */
-	else
-	if (ny >  4) tile_mode = 0x01; /* height 8 tiles */
-
-	if (d == 1)
-		return tile_mode;
-	else
-	if (tile_mode > 0x02)
-		tile_mode = 0x02;
-
-	if (d > 16 && tile_mode < 0x02)
-		return tile_mode | 0x50; /* depth 32 tiles */
-	if (d >  8) return tile_mode | 0x40; /* depth 16 tiles */
-	if (d >  4) return tile_mode | 0x30; /* depth 8 tiles */
-	if (d >  2) return tile_mode | 0x20; /* depth 4 tiles */
-
-	return tile_mode | 0x10;
+   uint32_t tile_mode = 0x00;
+
+   if (ny > 32) tile_mode = 0x04; /* height 128 tiles */
+   else
+   if (ny > 16) tile_mode = 0x03; /* height 64 tiles */
+   else
+   if (ny >  8) tile_mode = 0x02; /* height 32 tiles */
+   else
+   if (ny >  4) tile_mode = 0x01; /* height 16 tiles */
+
+   if (nz == 1)
+      return tile_mode;
+   else
+   if (tile_mode > 0x02)
+      tile_mode = 0x02;
+
+   if (nz > 16 && tile_mode < 0x02)
+      return tile_mode | 0x50; /* depth 32 tiles */
+   if (nz > 8) return tile_mode | 0x40; /* depth 16 tiles */
+   if (nz > 4) return tile_mode | 0x30; /* depth 8 tiles */
+   if (nz > 2) return tile_mode | 0x20; /* depth 4 tiles */
+
+   return tile_mode | 0x10;
 }
 
 static INLINE unsigned
-get_zslice_offset(unsigned tile_mode, unsigned z, unsigned pitch, unsigned nb_h)
+calc_zslice_offset(uint32_t tile_mode, unsigned z, unsigned pitch, unsigned nbh)
 {
-	unsigned tile_h = get_tile_height(tile_mode);
-	unsigned tile_d = get_tile_depth(tile_mode);
+   unsigned tile_h = NV50_TILE_HEIGHT(tile_mode);
+   unsigned tile_d_shift = NV50_TILE_DIM_SHIFT(tile_mode, 1);
+   unsigned tile_d = 1 << tile_d_shift;
 
-	/* pitch_2d == to next slice within this volume-tile */
-	/* pitch_3d == size (in bytes) of a volume-tile */
-	unsigned pitch_2d = tile_h * 64;
-	unsigned pitch_3d = tile_d * align(nb_h, tile_h) * pitch;
+   /* stride_2d == to next slice within this volume tile */
+   /* stride_3d == size (in bytes) of a volume tile */
+   unsigned stride_2d = tile_h * NV50_TILE_PITCH(tile_mode);
+   unsigned stride_3d = tile_d * align(nbh, tile_h) * pitch;
 
-	return (z % tile_d) * pitch_2d + (z / tile_d) * pitch_3d;
+   return (z & (tile_d - 1)) * stride_2d + (z >> tile_d_shift) * stride_3d;
 }
 
-
-
-
 static void
-nv50_miptree_destroy(struct pipe_screen *pscreen,
-		     struct pipe_resource *pt)
+nv50_miptree_destroy(struct pipe_screen *pscreen, struct pipe_resource *pt)
 {
-	struct nv50_miptree *mt = nv50_miptree(pt);
-	unsigned l;
+   struct nv50_miptree *mt = nv50_miptree(pt);
 
-	for (l = 0; l <= pt->last_level; ++l)
-		FREE(mt->level[l].image_offset);
+   nouveau_screen_bo_release(pscreen, mt->base.bo);
 
-	nouveau_screen_bo_release(pscreen, mt->base.bo);
-	FREE(mt);
+   FREE(mt);
 }
 
 static boolean
 nv50_miptree_get_handle(struct pipe_screen *pscreen,
-			struct pipe_resource *pt,
-			struct winsys_handle *whandle)
+                        struct pipe_resource *pt,
+                        struct winsys_handle *whandle)
 {
-	struct nv50_miptree *mt = nv50_miptree(pt);
-	unsigned stride;
+   struct nv50_miptree *mt = nv50_miptree(pt);
+   unsigned stride;
 
+   if (!mt || !mt->base.bo)
+      return FALSE;
 
-	if (!mt || !mt->base.bo)
-		return FALSE;
+   stride = util_format_get_stride(mt->base.base.format,
+                                   mt->base.base.width0);
 
-	stride = util_format_get_stride(mt->base.base.format,
-					mt->base.base.width0);
-
-	return nouveau_screen_bo_get_handle(pscreen,
-					    mt->base.bo,
-					    stride,
-					    whandle);
+   return nouveau_screen_bo_get_handle(pscreen,
+                                       mt->base.bo,
+                                       stride,
+                                       whandle);
 }
 
-
 const struct u_resource_vtbl nv50_miptree_vtbl =
 {
-   nv50_miptree_get_handle,	      /* get_handle */
-   nv50_miptree_destroy,	      /* resource_destroy */
-   NULL,			      /* is_resource_referenced */
-   nv50_miptree_transfer_new,	      /* get_transfer */
-   nv50_miptree_transfer_del,     /* transfer_destroy */
+   nv50_miptree_get_handle,         /* get_handle */
+   nv50_miptree_destroy,            /* resource_destroy */
+   NULL,                            /* is_resource_referenced */
+   nv50_miptree_transfer_new,       /* get_transfer */
+   nv50_miptree_transfer_del,       /* transfer_destroy */
    nv50_miptree_transfer_map,	      /* transfer_map */
-   u_default_transfer_flush_region,   /* transfer_flush_region */
-   nv50_miptree_transfer_unmap,	      /* transfer_unmap */
-   u_default_transfer_inline_write    /* transfer_inline_write */
+   u_default_transfer_flush_region, /* transfer_flush_region */
+   nv50_miptree_transfer_unmap,     /* transfer_unmap */
+   u_default_transfer_inline_write  /* transfer_inline_write */
 };
 
-
-
 struct pipe_resource *
-nv50_miptree_create(struct pipe_screen *pscreen, const struct pipe_resource *tmp)
+nv50_miptree_create(struct pipe_screen *pscreen,
+                    const struct pipe_resource *templ)
 {
-	struct nouveau_device *dev = nouveau_screen(pscreen)->device;
-	struct nv50_miptree *mt = CALLOC_STRUCT(nv50_miptree);
-	struct pipe_resource *pt = &mt->base.base;
-	unsigned width = tmp->width0, height = tmp->height0;
-	unsigned depth = tmp->depth0, image_alignment;
-	uint32_t tile_flags;
-	int ret, i, l;
-
-	if (!mt)
-		return NULL;
-
-	*pt = *tmp;
-	mt->base.vtbl = &nv50_miptree_vtbl;
-	pipe_reference_init(&pt->reference, 1);
-	pt->screen = pscreen;
-
-	switch (pt->format) {
-	case PIPE_FORMAT_Z32_FLOAT:
-		tile_flags = 0x4800;
-		break;
-	case PIPE_FORMAT_S8_USCALED_Z24_UNORM:
-		tile_flags = 0x1800;
-		break;
-	case PIPE_FORMAT_Z16_UNORM:
-		tile_flags = 0x6c00;
-		break;
-	case PIPE_FORMAT_Z24X8_UNORM:
-	case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
-		tile_flags = 0x2800;
-		break;
-	case PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED:
-		tile_flags = 0xe000;
-		break;
-	case PIPE_FORMAT_R32G32B32A32_FLOAT:
-	case PIPE_FORMAT_R32G32B32_FLOAT:
-		tile_flags = 0x7400;
-		break;
-	default:
-		if ((pt->bind & PIPE_BIND_SCANOUT) &&
-		    util_format_get_blocksizebits(pt->format) == 32)
-			tile_flags = 0x7a00;
-		else
-			tile_flags = 0x7000;
-		break;
-	}
-
-	/* XXX: texture arrays */
-	mt->image_nr = (pt->target == PIPE_TEXTURE_CUBE) ? 6 : 1;
-
-	for (l = 0; l <= pt->last_level; l++) {
-		struct nv50_miptree_level *lvl = &mt->level[l];
-		unsigned nblocksy = util_format_get_nblocksy(pt->format, height);
-
-		lvl->image_offset = CALLOC(mt->image_nr, sizeof(int));
-		lvl->pitch = align(util_format_get_stride(pt->format, width), 64);
-		lvl->tile_mode = get_tile_mode(nblocksy, depth);
-
-		width = u_minify(width, 1);
-		height = u_minify(height, 1);
-		depth = u_minify(depth, 1);
-	}
-
-	image_alignment  = get_tile_height(mt->level[0].tile_mode) * 64;
-	image_alignment *= get_tile_depth(mt->level[0].tile_mode);
-
-	/* NOTE the distinction between arrays of mip-mapped 2D textures and
-	 * mip-mapped 3D textures. We can't use image_nr == depth for 3D mip.
-	 */
-	for (i = 0; i < mt->image_nr; i++) {
-		for (l = 0; l <= pt->last_level; l++) {
-			struct nv50_miptree_level *lvl = &mt->level[l];
-			int size;
-			unsigned tile_h = get_tile_height(lvl->tile_mode);
-			unsigned tile_d = get_tile_depth(lvl->tile_mode);
-
-			size  = lvl->pitch;
-			size *= align(util_format_get_nblocksy(pt->format, u_minify(pt->height0, l)), tile_h);
-			size *= align(u_minify(pt->depth0, l), tile_d);
-
-			lvl->image_offset[i] = mt->total_size;
-
-			mt->total_size += size;
-		}
-		mt->total_size = align(mt->total_size, image_alignment);
-	}
-
-	ret = nouveau_bo_new_tile(dev, NOUVEAU_BO_VRAM, 256, mt->total_size,
-				  mt->level[0].tile_mode, tile_flags,
-				  &mt->base.bo);
-	if (ret) {
-		for (l = 0; l <= pt->last_level; ++l)
-			FREE(mt->level[l].image_offset);
-		FREE(mt);
-		return NULL;
-	}
-
-	return pt;
+   struct nouveau_device *dev = nouveau_screen(pscreen)->device;
+   struct nv50_miptree *mt = CALLOC_STRUCT(nv50_miptree);
+   struct pipe_resource *pt = &mt->base.base;
+   int ret;
+   unsigned w, h, d, l, alloc_size;
+   uint32_t tile_flags;
+
+   if (!mt)
+      return NULL;
+
+   mt->base.vtbl = &nv50_miptree_vtbl;
+   *pt = *templ;
+   pipe_reference_init(&pt->reference, 1);
+   pt->screen = pscreen;
+
+   mt->layout_3d = pt->target == PIPE_TEXTURE_3D;
+
+   w = pt->width0;
+   h = pt->height0;
+   d = mt->layout_3d ? pt->depth0 : 1;
+
+   switch (pt->format) {
+   case PIPE_FORMAT_Z16_UNORM:
+      tile_flags = 0x6c00;
+      break;
+   case PIPE_FORMAT_S8_USCALED_Z24_UNORM:
+      tile_flags = 0x1800;
+      break;
+   case PIPE_FORMAT_Z24X8_UNORM:
+   case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
+      tile_flags = 0x2800;
+      break;
+   case PIPE_FORMAT_R32G32B32A32_FLOAT:
+   case PIPE_FORMAT_R32G32B32_FLOAT:
+      tile_flags = 0x7400;
+      break;
+   case PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED:
+      tile_flags = 0x6000;
+      break;
+   default:
+      if ((pt->bind & PIPE_BIND_SCANOUT) &&
+          util_format_get_blocksizebits(pt->format) == 32)
+         tile_flags = 0x7a00;
+      else
+         tile_flags = 0x7000;
+      break;
+   }
+
+   /* For 3D textures, a mipmap is spanned by all the layers, for array
+    * textures and cube maps, each layer contains its own mipmaps.
+    */
+   for (l = 0; l <= pt->last_level; ++l) {
+      struct nv50_miptree_level *lvl = &mt->level[l];
+      unsigned nbx = util_format_get_nblocksx(pt->format, w);
+      unsigned nby = util_format_get_nblocksy(pt->format, h);
+      unsigned blocksize = util_format_get_blocksize(pt->format);
+
+      lvl->offset = mt->total_size;
+      lvl->tile_mode = get_tile_dims(nbx, nby, d);
+      lvl->pitch = align(nbx * blocksize, NV50_TILE_PITCH(lvl->tile_mode));
+
+      mt->total_size += lvl->pitch *
+         align(nby, NV50_TILE_HEIGHT(lvl->tile_mode)) *
+         align(d, NV50_TILE_DEPTH(lvl->tile_mode));
+
+      w = u_minify(w, 1);
+      h = u_minify(h, 1);
+      d = u_minify(d, 1);
+   }
+
+   if (pt->array_size > 1) {
+      mt->layer_stride = align(mt->total_size,
+                               NV50_TILE_SIZE(mt->level[0].tile_mode));
+      mt->total_size = mt->layer_stride * pt->array_size;
+   }
+
+   alloc_size = mt->total_size;
+
+   ret = nouveau_bo_new_tile(dev, NOUVEAU_BO_VRAM, 256, alloc_size,
+                             mt->level[0].tile_mode, tile_flags,
+                             &mt->base.bo);
+   if (ret) {
+      FREE(mt);
+      return NULL;
+   }
+   mt->base.domain = NOUVEAU_BO_VRAM;
+
+   return pt;
 }
 
-
 struct pipe_resource *
 nv50_miptree_from_handle(struct pipe_screen *pscreen,
-			 const struct pipe_resource *template,
-			 struct winsys_handle *whandle)
+                         const struct pipe_resource *templ,
+                         struct winsys_handle *whandle)
 {
-	struct nv50_miptree *mt;
-	unsigned stride;
-
-	/* Only supports 2D, non-mipmapped textures for the moment */
-	if ((template->target != PIPE_TEXTURE_2D &&
-	      template->target != PIPE_TEXTURE_RECT) ||
-	    template->last_level != 0 ||
-	    template->depth0 != 1)
-		return NULL;
-
-	mt = CALLOC_STRUCT(nv50_miptree);
-	if (!mt)
-		return NULL;
-
-	mt->base.bo = nouveau_screen_bo_from_handle(pscreen, whandle, &stride);
-	if (mt->base.bo == NULL) {
-		FREE(mt);
-		return NULL;
-	}
-
-
-	mt->base.base = *template;
-	mt->base.vtbl = &nv50_miptree_vtbl;
-	pipe_reference_init(&mt->base.base.reference, 1);
-	mt->base.base.screen = pscreen;
-	mt->image_nr = 1;
-	mt->level[0].pitch = stride;
-	mt->level[0].image_offset = CALLOC(1, sizeof(unsigned));
-	mt->level[0].tile_mode = mt->base.bo->tile_mode;
-
-	/* XXX: Need to adjust bo refcount??
-	 */
-	/* nouveau_bo_ref(bo, &mt->base.bo); */
-	return &mt->base.base;
+   struct nv50_miptree *mt;
+   unsigned stride;
+
+   /* only supports 2D, non-mipmapped textures for the moment */
+   if ((templ->target != PIPE_TEXTURE_2D &&
+        templ->target != PIPE_TEXTURE_RECT) ||
+       templ->last_level != 0 ||
+       templ->depth0 != 1 ||
+       templ->array_size > 1)
+      return NULL;
+
+   mt = CALLOC_STRUCT(nv50_miptree);
+   if (!mt)
+      return NULL;
+
+   mt->base.bo = nouveau_screen_bo_from_handle(pscreen, whandle, &stride);
+   if (mt->base.bo == NULL) {
+      FREE(mt);
+      return NULL;
+   }
+
+   mt->base.base = *templ;
+   mt->base.vtbl = &nv50_miptree_vtbl;
+   pipe_reference_init(&mt->base.base.reference, 1);
+   mt->base.base.screen = pscreen;
+   mt->level[0].pitch = stride;
+   mt->level[0].offset = 0;
+   mt->level[0].tile_mode = mt->base.bo->tile_mode;
+
+   /* no need to adjust bo reference count */
+   return &mt->base.base;
 }
 
 
-
-/* Surface functions
+/* Surface functions.
  */
 
 struct pipe_surface *
-nv50_miptree_surface_new(struct pipe_context *pipe, struct pipe_resource *pt,
-			 const struct pipe_surface *surf_tmpl)
+nv50_miptree_surface_new(struct pipe_context *pipe,
+                         struct pipe_resource *pt,
+                         const struct pipe_surface *templ)
 {
-	unsigned level = surf_tmpl->u.tex.level;
-	struct nv50_miptree *mt = nv50_miptree(pt);
-	struct nv50_miptree_level *lvl = &mt->level[level];
-	struct nv50_surface *ns;
-	unsigned img = 0, zslice = 0;
-
-	assert(surf_tmpl->u.tex.first_layer == surf_tmpl->u.tex.last_layer);
-
-	/* XXX can't unify these here? */
-	if (pt->target == PIPE_TEXTURE_CUBE)
-		img = surf_tmpl->u.tex.first_layer;
-	else if (pt->target == PIPE_TEXTURE_3D)
-		zslice = surf_tmpl->u.tex.first_layer;
-
-	ns = CALLOC_STRUCT(nv50_surface);
-	if (!ns)
-		return NULL;
-	pipe_resource_reference(&ns->base.texture, pt);
-	ns->base.context = pipe;
-	ns->base.format = pt->format;
-	ns->base.width = u_minify(pt->width0, level);
-	ns->base.height = u_minify(pt->height0, level);
-	ns->base.usage = surf_tmpl->usage;
-	pipe_reference_init(&ns->base.reference, 1);
-	ns->base.u.tex.level = level;
-	ns->base.u.tex.first_layer = surf_tmpl->u.tex.first_layer;
-	ns->base.u.tex.last_layer = surf_tmpl->u.tex.last_layer;
-	ns->offset = lvl->image_offset[img];
-
-	if (pt->target == PIPE_TEXTURE_3D) {
-		unsigned nb_h = util_format_get_nblocksy(pt->format, ns->base.height);
-		ns->offset += get_zslice_offset(lvl->tile_mode, zslice,
-						lvl->pitch, nb_h);
-	}
-
-	return &ns->base;
+   struct nv50_miptree *mt = nv50_miptree(pt); /* guaranteed */
+   struct nv50_surface *ns;
+   struct pipe_surface *ps;
+   struct nv50_miptree_level *lvl = &mt->level[templ->u.tex.level];
+
+   ns = CALLOC_STRUCT(nv50_surface);
+   if (!ns)
+      return NULL;
+   ps = &ns->base;
+
+   pipe_reference_init(&ps->reference, 1);
+   pipe_resource_reference(&ps->texture, pt);
+   ps->context = pipe;
+   ps->format = templ->format;
+   ps->usage = templ->usage;
+   ps->u.tex.level = templ->u.tex.level;
+   ps->u.tex.first_layer = templ->u.tex.first_layer;
+   ps->u.tex.last_layer = templ->u.tex.last_layer;
+
+   ns->width = u_minify(pt->width0, ps->u.tex.level);
+   ns->height = u_minify(pt->height0, ps->u.tex.level);
+   ns->depth = ps->u.tex.last_layer - ps->u.tex.first_layer + 1;
+   ns->offset = lvl->offset;
+
+   /* comment says there are going to be removed, but they're used by the st */
+   ps->width = ns->width;
+   ps->height = ns->height;
+
+   if (mt->layout_3d) {
+      unsigned zslice = ps->u.tex.first_layer;
+
+      /* TODO: re-layout the texture to use only depth 1 tiles in this case: */
+      if (ns->depth > 1 && (zslice & (NV50_TILE_DEPTH(lvl->tile_mode) - 1)))
+         NOUVEAU_ERR("Creating unsupported 3D surface of slices [%u:%u].\n",
+                     zslice, ps->u.tex.last_layer);
+
+      ns->offset += calc_zslice_offset(lvl->tile_mode, zslice, lvl->pitch,
+                                       util_format_get_nblocksy(pt->format,
+                                                                ns->height));
+   } else {
+      ns->offset += mt->layer_stride * ps->u.tex.first_layer;
+   }
+
+   return ps;
 }
 
 void
-nv50_miptree_surface_del(struct pipe_context *pipe,
-			 struct pipe_surface *ps)
+nv50_miptree_surface_del(struct pipe_context *pipe, struct pipe_surface *ps)
 {
-	struct nv50_surface *s = nv50_surface(ps);
+   struct nv50_surface *s = nv50_surface(ps);
+
+   pipe_resource_reference(&ps->texture, NULL);
 
-	pipe_resource_reference(&s->base.texture, NULL);
-	FREE(s);
+   FREE(s);
 }