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 <pq@iki.fi>

1 files changed, 27 insertions, 27 deletions

diff --git a/src/gallium/drivers/nv20/nv20_screen.c b/src/gallium/drivers/nv20/nv20_screen.c
index 27a9edf9bb..b7f5ea8512 100644
--- a/src/gallium/drivers/nv20/nv20_screen.c
+++ b/src/gallium/drivers/nv20/nv20_screen.c
@@ -1,13 +1,13 @@
 #include "pipe/p_screen.h"
 
-#include "nv10_context.h"
-#include "nv10_screen.h"
+#include "nv20_context.h"
+#include "nv20_screen.h"
 
 static const char *
-nv10_screen_get_name(struct pipe_screen *screen)
+nv20_screen_get_name(struct pipe_screen *screen)
 {
-	struct nv10_screen *nv10screen = nv10_screen(screen);
-	struct nouveau_device *dev = nv10screen->nvws->channel->device;
+	struct nv20_screen *nv20screen = nv20_screen(screen);
+	struct nouveau_device *dev = nv20screen->nvws->channel->device;
 	static char buffer[128];
 
 	snprintf(buffer, sizeof(buffer), "NV%02X", dev->chipset);
@@ -15,13 +15,13 @@ nv10_screen_get_name(struct pipe_screen *screen)
 }
 
 static const char *
-nv10_screen_get_vendor(struct pipe_screen *screen)
+nv20_screen_get_vendor(struct pipe_screen *screen)
 {
 	return "nouveau";
 }
 
 static int
-nv10_screen_get_param(struct pipe_screen *screen, int param)
+nv20_screen_get_param(struct pipe_screen *screen, int param)
 {
 	switch (param) {
 	case PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS:
@@ -60,7 +60,7 @@ nv10_screen_get_param(struct pipe_screen *screen, int param)
 }
 
 static float
-nv10_screen_get_paramf(struct pipe_screen *screen, int param)
+nv20_screen_get_paramf(struct pipe_screen *screen, int param)
 {
 	switch (param) {
 	case PIPE_CAP_MAX_LINE_WIDTH:
@@ -80,7 +80,7 @@ nv10_screen_get_paramf(struct pipe_screen *screen, int param)
 }
 
 static boolean
-nv10_screen_is_format_supported(struct pipe_screen *screen,
+nv20_screen_is_format_supported(struct pipe_screen *screen,
 				enum pipe_format format,
 				enum pipe_texture_target target,
 				unsigned tex_usage, unsigned geom_flags)
@@ -114,7 +114,7 @@ nv10_screen_is_format_supported(struct pipe_screen *screen,
 }
 
 static void *
-nv10_surface_map(struct pipe_screen *screen, struct pipe_surface *surface,
+nv20_surface_map(struct pipe_screen *screen, struct pipe_surface *surface,
 		 unsigned flags )
 {
 	struct pipe_winsys *ws = screen->winsys;
@@ -128,7 +128,7 @@ nv10_surface_map(struct pipe_screen *screen, struct pipe_surface *surface,
 }
 
 static void
-nv10_surface_unmap(struct pipe_screen *screen, struct pipe_surface *surface)
+nv20_surface_unmap(struct pipe_screen *screen, struct pipe_surface *surface)
 {
 	struct pipe_winsys *ws = screen->winsys;
 
@@ -136,21 +136,21 @@ nv10_surface_unmap(struct pipe_screen *screen, struct pipe_surface *surface)
 }
 
 static void
-nv10_screen_destroy(struct pipe_screen *pscreen)
+nv20_screen_destroy(struct pipe_screen *pscreen)
 {
-	struct nv10_screen *screen = nv10_screen(pscreen);
+	struct nv20_screen *screen = nv20_screen(pscreen);
 	struct nouveau_winsys *nvws = screen->nvws;
 
 	nvws->notifier_free(&screen->sync);
-	nvws->grobj_free(&screen->celsius);
+	nvws->grobj_free(&screen->kelvin);
 
 	FREE(pscreen);
 }
 
 struct pipe_screen *
-nv10_screen_create(struct pipe_winsys *ws, struct nouveau_winsys *nvws)
+nv20_screen_create(struct pipe_winsys *ws, struct nouveau_winsys *nvws)
 {
-	struct nv10_screen *screen = CALLOC_STRUCT(nv10_screen);
+	struct nv20_screen *screen = CALLOC_STRUCT(nv20_screen);
 	unsigned celsius_class;
 	unsigned chipset = nvws->channel->device->chipset;
 	int ret;
@@ -174,7 +174,7 @@ nv10_screen_create(struct pipe_winsys *ws, struct nouveau_winsys *nvws)
 		return NULL;
 	}
 
-	ret = nvws->grobj_alloc(nvws, celsius_class, &screen->celsius);
+	ret = nvws->grobj_alloc(nvws, celsius_class, &screen->kelvin);
 	if (ret) {
 		NOUVEAU_ERR("Error creating 3D object: %d\n", ret);
 		return FALSE;
@@ -184,24 +184,24 @@ nv10_screen_create(struct pipe_winsys *ws, struct nouveau_winsys *nvws)
 	ret = nvws->notifier_alloc(nvws, 1, &screen->sync);
 	if (ret) {
 		NOUVEAU_ERR("Error creating notifier object: %d\n", ret);
-		nv10_screen_destroy(&screen->pipe);
+		nv20_screen_destroy(&screen->pipe);
 		return NULL;
 	}
 
 	screen->pipe.winsys = ws;
-	screen->pipe.destroy = nv10_screen_destroy;
+	screen->pipe.destroy = nv20_screen_destroy;
 
-	screen->pipe.get_name = nv10_screen_get_name;
-	screen->pipe.get_vendor = nv10_screen_get_vendor;
-	screen->pipe.get_param = nv10_screen_get_param;
-	screen->pipe.get_paramf = nv10_screen_get_paramf;
+	screen->pipe.get_name = nv20_screen_get_name;
+	screen->pipe.get_vendor = nv20_screen_get_vendor;
+	screen->pipe.get_param = nv20_screen_get_param;
+	screen->pipe.get_paramf = nv20_screen_get_paramf;
 
-	screen->pipe.is_format_supported = nv10_screen_is_format_supported;
+	screen->pipe.is_format_supported = nv20_screen_is_format_supported;
 
-	screen->pipe.surface_map = nv10_surface_map;
-	screen->pipe.surface_unmap = nv10_surface_unmap;
+	screen->pipe.surface_map = nv20_surface_map;
+	screen->pipe.surface_unmap = nv20_surface_unmap;
 
-	nv10_screen_init_miptree_functions(&screen->pipe);
+	nv20_screen_init_miptree_functions(&screen->pipe);
 
 	return &screen->pipe;
 }