nv30, nv40: unify all structures and headers, except shaders

This patch unifies nv[34]0_screen.h, nv[34]0_context.h and
nv[34]0_state.h

The unified files are put in a new "nvfx" directory.

nv30_context.h and nv40_context.h still exist to hold the function
prototypes and include nvfx_context.h

nv[34]0_screen.h and nv[34]0_state.h are deleted, replaced by the
unified versions.

nv40 includes some extra fields for swtnl and user clip planes
support.

These fields will be unused on nv30 until that functionality gets
added to it too (by unification with nv40).

1 files changed, 4 insertions, 4 deletions

diff --git a/src/gallium/drivers/nv30/nv30_draw.c b/src/gallium/drivers/nv30/nv30_draw.c
index 74fc138c051..5d22e78abf7 100644
--- a/src/gallium/drivers/nv30/nv30_draw.c
+++ b/src/gallium/drivers/nv30/nv30_draw.c
@@ -4,7 +4,7 @@
 
 struct nv30_draw_stage {
 	struct draw_stage draw;
-	struct nv30_context *nv30;
+	struct nvfx_context *nvfx;
 };
 
 static void
@@ -43,12 +43,12 @@ nv30_draw_destroy(struct draw_stage *draw)
 }
 
 struct draw_stage *
-nv30_draw_render_stage(struct nv30_context *nv30)
+nv30_draw_render_stage(struct nvfx_context *nvfx)
 {
 	struct nv30_draw_stage *nv30draw = CALLOC_STRUCT(nv30_draw_stage);
 
-	nv30draw->nv30 = nv30;
-	nv30draw->draw.draw = nv30->draw;
+	nv30draw->nvfx = nvfx;
+	nv30draw->draw.draw = nvfx->draw;
 	nv30draw->draw.point = nv30_draw_point;
 	nv30draw->draw.line = nv30_draw_line;
 	nv30draw->draw.tri = nv30_draw_tri;