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, 52 insertions, 52 deletions

diff --git a/src/gallium/drivers/nv20/nv20_context.h b/src/gallium/drivers/nv20/nv20_context.h
index f3b56de25a7..8ad926db20a 100644
--- a/src/gallium/drivers/nv20/nv20_context.h
+++ b/src/gallium/drivers/nv20/nv20_context.h
@@ -1,5 +1,5 @@
-#ifndef __NV10_CONTEXT_H__
-#define __NV10_CONTEXT_H__
+#ifndef __NV20_CONTEXT_H__
+#define __NV20_CONTEXT_H__
 
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
@@ -15,42 +15,42 @@
 #include "nouveau/nouveau_gldefs.h"
 
 #define NOUVEAU_PUSH_CONTEXT(ctx)                                              \
-	struct nv10_screen *ctx = nv10->screen
+	struct nv20_screen *ctx = nv20->screen
 #include "nouveau/nouveau_push.h"
 
-#include "nv10_state.h"
+#include "nv20_state.h"
 
 #define NOUVEAU_ERR(fmt, args...) \
 	fprintf(stderr, "%s:%d -  "fmt, __func__, __LINE__, ##args);
 #define NOUVEAU_MSG(fmt, args...) \
 	fprintf(stderr, "nouveau: "fmt, ##args);
 
-#define NV10_NEW_VERTPROG	(1 << 0)
-#define NV10_NEW_FRAGPROG	(1 << 1)
-#define NV10_NEW_VTXARRAYS	(1 << 2)
-#define NV10_NEW_BLEND		(1 << 3)
-#define NV10_NEW_BLENDCOL	(1 << 4)
-#define NV10_NEW_RAST 		(1 << 5)
-#define NV10_NEW_DSA  		(1 << 6)
-#define NV10_NEW_VIEWPORT	(1 << 7)
-#define NV10_NEW_SCISSOR	(1 << 8)
-#define NV10_NEW_FRAMEBUFFER	(1 << 9)
+#define NV20_NEW_VERTPROG	(1 << 0)
+#define NV20_NEW_FRAGPROG	(1 << 1)
+#define NV20_NEW_VTXARRAYS	(1 << 2)
+#define NV20_NEW_BLEND		(1 << 3)
+#define NV20_NEW_BLENDCOL	(1 << 4)
+#define NV20_NEW_RAST 		(1 << 5)
+#define NV20_NEW_DSA  		(1 << 6)
+#define NV20_NEW_VIEWPORT	(1 << 7)
+#define NV20_NEW_SCISSOR	(1 << 8)
+#define NV20_NEW_FRAMEBUFFER	(1 << 9)
 
-#include "nv10_screen.h"
+#include "nv20_screen.h"
 
-struct nv10_context {
+struct nv20_context {
 	struct pipe_context pipe;
 
 	struct nouveau_winsys *nvws;
-	struct nv10_screen *screen;
+	struct nv20_screen *screen;
 	unsigned pctx_id;
 
 	struct draw_context *draw;
 
 	uint32_t dirty;
 
-	struct nv10_sampler_state *tex_sampler[PIPE_MAX_SAMPLERS];
-	struct nv10_miptree *tex_miptree[PIPE_MAX_SAMPLERS];
+	struct nv20_sampler_state *tex_sampler[PIPE_MAX_SAMPLERS];
+	struct nv20_miptree *tex_miptree[PIPE_MAX_SAMPLERS];
 	unsigned dirty_samplers;
 	unsigned fp_samplers;
 	unsigned vp_samplers;
@@ -60,10 +60,10 @@ struct nv10_context {
 	struct pipe_buffer *zeta;
 	uint32_t lma_offset;
 
-	struct nv10_blend_state *blend;
+	struct nv20_blend_state *blend;
 	struct pipe_blend_color *blend_color;
-	struct nv10_rasterizer_state *rast;
-	struct nv10_depth_stencil_alpha_state *dsa;
+	struct nv20_rasterizer_state *rast;
+	struct nv20_depth_stencil_alpha_state *dsa;
 	struct pipe_viewport_state *viewport;
 	struct pipe_scissor_state *scissor;
 	struct pipe_framebuffer_state *framebuffer;
@@ -90,15 +90,15 @@ struct nv10_context {
 		struct nouveau_resource *exec_heap;
 		struct nouveau_resource *data_heap;
 
-		struct nv10_vertex_program *active;
+		struct nv20_vertex_program *active;
 
-		struct nv10_vertex_program *current;
+		struct nv20_vertex_program *current;
 	} vertprog;
 */
 	struct {
-		struct nv10_fragment_program *active;
+		struct nv20_fragment_program *active;
 
-		struct nv10_fragment_program *current;
+		struct nv20_fragment_program *current;
 		struct pipe_buffer *constant_buf;
 	} fragprog;
 
@@ -106,45 +106,45 @@ struct nv10_context {
 	struct pipe_vertex_element vtxelt[PIPE_MAX_ATTRIBS];
 };
 
-static INLINE struct nv10_context *
-nv10_context(struct pipe_context *pipe)
+static INLINE struct nv20_context *
+nv20_context(struct pipe_context *pipe)
 {
-	return (struct nv10_context *)pipe;
+	return (struct nv20_context *)pipe;
 }
 
-extern void nv10_init_state_functions(struct nv10_context *nv10);
-extern void nv10_init_surface_functions(struct nv10_context *nv10);
+extern void nv20_init_state_functions(struct nv20_context *nv20);
+extern void nv20_init_surface_functions(struct nv20_context *nv20);
 
-extern void nv10_screen_init_miptree_functions(struct pipe_screen *pscreen);
+extern void nv20_screen_init_miptree_functions(struct pipe_screen *pscreen);
 
-/* nv10_clear.c */
-extern void nv10_clear(struct pipe_context *pipe, struct pipe_surface *ps,
+/* nv20_clear.c */
+extern void nv20_clear(struct pipe_context *pipe, struct pipe_surface *ps,
 		       unsigned clearValue);
 
-/* nv10_draw.c */
-extern struct draw_stage *nv10_draw_render_stage(struct nv10_context *nv10);
+/* nv20_draw.c */
+extern struct draw_stage *nv20_draw_render_stage(struct nv20_context *nv20);
 
-/* nv10_fragprog.c */
-extern void nv10_fragprog_bind(struct nv10_context *,
-			       struct nv10_fragment_program *);
-extern void nv10_fragprog_destroy(struct nv10_context *,
-				  struct nv10_fragment_program *);
+/* nv20_fragprog.c */
+extern void nv20_fragprog_bind(struct nv20_context *,
+			       struct nv20_fragment_program *);
+extern void nv20_fragprog_destroy(struct nv20_context *,
+				  struct nv20_fragment_program *);
 
-/* nv10_fragtex.c */
-extern void nv10_fragtex_bind(struct nv10_context *);
+/* nv20_fragtex.c */
+extern void nv20_fragtex_bind(struct nv20_context *);
 
-/* nv10_prim_vbuf.c */
-struct draw_stage *nv10_draw_vbuf_stage( struct nv10_context *nv10 );
-extern void nv10_vtxbuf_bind(struct nv10_context* nv10);
+/* nv20_prim_vbuf.c */
+struct draw_stage *nv20_draw_vbuf_stage( struct nv20_context *nv20 );
+extern void nv20_vtxbuf_bind(struct nv20_context* nv20);
 
-/* nv10_state.c and friends */
-extern void nv10_emit_hw_state(struct nv10_context *nv10);
-extern void nv10_state_tex_update(struct nv10_context *nv10);
+/* nv20_state.c and friends */
+extern void nv20_emit_hw_state(struct nv20_context *nv20);
+extern void nv20_state_tex_update(struct nv20_context *nv20);
 
-/* nv10_vbo.c */
-extern boolean nv10_draw_arrays(struct pipe_context *, unsigned mode,
+/* nv20_vbo.c */
+extern boolean nv20_draw_arrays(struct pipe_context *, unsigned mode,
 				unsigned start, unsigned count);
-extern boolean nv10_draw_elements( struct pipe_context *pipe,
+extern boolean nv20_draw_elements( struct pipe_context *pipe,
                     struct pipe_buffer *indexBuffer,
                     unsigned indexSize,
                     unsigned prim, unsigned start, unsigned count);