Nouveau: name replace for nv20.

No functional changes, only changed function, struct, macro etc. names.
nv10 -> nv20
nv30 -> nv20
celsius -> kelvin
Did not touch fifo command macros.

Don't try to build nv20_vertprog.c for now.

Signed-off-by: Pekka Paalanen <[email protected]>

1 files changed, 34 insertions, 34 deletions

diff --git a/src/gallium/drivers/nv20/nv20_miptree.c b/src/gallium/drivers/nv20/nv20_miptree.c
index ad084e72b81..dbfd779de9d 100644
--- a/src/gallium/drivers/nv20/nv20_miptree.c
+++ b/src/gallium/drivers/nv20/nv20_miptree.c
@@ -2,13 +2,13 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_inlines.h"
 
-#include "nv10_context.h"
-#include "nv10_screen.h"
+#include "nv20_context.h"
+#include "nv20_screen.h"
 
 static void
-nv10_miptree_layout(struct nv10_miptree *nv10mt)
+nv20_miptree_layout(struct nv20_miptree *nv20mt)
 {
-	struct pipe_texture *pt = &nv10mt->base;
+	struct pipe_texture *pt = &nv20mt->base;
 	boolean swizzled = FALSE;
 	uint width = pt->width[0], height = pt->height[0];
 	uint offset = 0;
@@ -27,12 +27,12 @@ nv10_miptree_layout(struct nv10_miptree *nv10mt)
 		pt->nblocksy[l] = pf_get_nblocksy(&pt->block, height);
 
 		if (swizzled)
-			nv10mt->level[l].pitch = pt->nblocksx[l] * pt->block.size;
+			nv20mt->level[l].pitch = pt->nblocksx[l] * pt->block.size;
 		else
-			nv10mt->level[l].pitch = pt->nblocksx[0] * pt->block.size;
-		nv10mt->level[l].pitch = (nv10mt->level[l].pitch + 63) & ~63;
+			nv20mt->level[l].pitch = pt->nblocksx[0] * pt->block.size;
+		nv20mt->level[l].pitch = (nv20mt->level[l].pitch + 63) & ~63;
 
-		nv10mt->level[l].image_offset =
+		nv20mt->level[l].image_offset =
 			CALLOC(nr_faces, sizeof(unsigned));
 
 		width  = MAX2(1, width  >> 1);
@@ -42,28 +42,28 @@ nv10_miptree_layout(struct nv10_miptree *nv10mt)
 
 	for (f = 0; f < nr_faces; f++) {
 		for (l = 0; l <= pt->last_level; l++) {
-			nv10mt->level[l].image_offset[f] = offset;
-			offset += nv10mt->level[l].pitch * pt->height[l];
+			nv20mt->level[l].image_offset[f] = offset;
+			offset += nv20mt->level[l].pitch * pt->height[l];
 		}
 	}
 
-	nv10mt->total_size = offset;
+	nv20mt->total_size = offset;
 }
 
 static struct pipe_texture *
-nv10_miptree_create(struct pipe_screen *screen, const struct pipe_texture *pt)
+nv20_miptree_create(struct pipe_screen *screen, const struct pipe_texture *pt)
 {
 	struct pipe_winsys *ws = screen->winsys;
-	struct nv10_miptree *mt;
+	struct nv20_miptree *mt;
 
-	mt = MALLOC(sizeof(struct nv10_miptree));
+	mt = MALLOC(sizeof(struct nv20_miptree));
 	if (!mt)
 		return NULL;
 	mt->base = *pt;
 	mt->base.refcount = 1;
 	mt->base.screen = screen;
 
-	nv10_miptree_layout(mt);
+	nv20_miptree_layout(mt);
 
 	mt->buffer = ws->buffer_create(ws, 256, PIPE_BUFFER_USAGE_PIXEL,
 					   mt->total_size);
@@ -76,72 +76,72 @@ 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)
+nv20_miptree_release(struct pipe_screen *screen, struct pipe_texture **pt)
 {
 	struct pipe_texture *mt = *pt;
 
 	*pt = NULL;
 	if (--mt->refcount <= 0) {
-		struct nv10_miptree *nv10mt = (struct nv10_miptree *)mt;
+		struct nv20_miptree *nv20mt = (struct nv20_miptree *)mt;
 		int l;
 
-		pipe_buffer_reference(screen, &nv10mt->buffer, NULL);
+		pipe_buffer_reference(screen, &nv20mt->buffer, NULL);
 		for (l = 0; l <= mt->last_level; l++) {
-			if (nv10mt->level[l].image_offset)
-				FREE(nv10mt->level[l].image_offset);
+			if (nv20mt->level[l].image_offset)
+				FREE(nv20mt->level[l].image_offset);
 		}
-		FREE(nv10mt);
+		FREE(nv20mt);
 	}
 }
 
 static void
-nv10_miptree_update(struct pipe_context *pipe, struct pipe_texture *mt,
+nv20_miptree_update(struct pipe_context *pipe, struct pipe_texture *mt,
 		    uint face, uint levels)
 {
 }
 
 
 static struct pipe_surface *
-nv10_miptree_surface_get(struct pipe_screen *screen, struct pipe_texture *pt,
+nv20_miptree_surface_get(struct pipe_screen *screen, struct pipe_texture *pt,
 			 unsigned face, unsigned level, unsigned zslice,
 			 unsigned flags)
 {
 	struct pipe_winsys *ws = screen->winsys;
-	struct nv10_miptree *nv10mt = (struct nv10_miptree *)pt;
+	struct nv20_miptree *nv20mt = (struct nv20_miptree *)pt;
 	struct pipe_surface *ps;
 
 	ps = ws->surface_alloc(ws);
 	if (!ps)
 		return NULL;
-	pipe_buffer_reference(screen, &ps->buffer, nv10mt->buffer);
+	pipe_buffer_reference(screen, &ps->buffer, nv20mt->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 = nv10mt->level[level].pitch;
+	ps->stride = nv20mt->level[level].pitch;
 
 	if (pt->target == PIPE_TEXTURE_CUBE) {
-		ps->offset = nv10mt->level[level].image_offset[face];
+		ps->offset = nv20mt->level[level].image_offset[face];
 	} else {
-		ps->offset = nv10mt->level[level].image_offset[0];
+		ps->offset = nv20mt->level[level].image_offset[0];
 	}
 
 	return ps;
 }
 
 static void
-nv10_miptree_surface_release(struct pipe_screen *screen,
+nv20_miptree_surface_release(struct pipe_screen *screen,
 			     struct pipe_surface **surface)
 {
 }
 
-void nv10_screen_init_miptree_functions(struct pipe_screen *pscreen)
+void nv20_screen_init_miptree_functions(struct pipe_screen *pscreen)
 {
-	pscreen->texture_create = nv10_miptree_create;
-	pscreen->texture_release = nv10_miptree_release;
-	pscreen->get_tex_surface = nv10_miptree_surface_get;
-	pscreen->tex_surface_release = nv10_miptree_surface_release;
+	pscreen->texture_create = nv20_miptree_create;
+	pscreen->texture_release = nv20_miptree_release;
+	pscreen->get_tex_surface = nv20_miptree_surface_get;
+	pscreen->tex_surface_release = nv20_miptree_surface_release;
 }