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

diff --git a/src/gallium/drivers/nv40/nv40_state_viewport.c b/src/gallium/drivers/nv40/nv40_state_viewport.c
index 43cf6e5a0a..bf73e1119e 100644
--- a/src/gallium/drivers/nv40/nv40_state_viewport.c
+++ b/src/gallium/drivers/nv40/nv40_state_viewport.c
@@ -1,17 +1,17 @@
 #include "nv40_context.h"
 
 static boolean
-nv40_state_viewport_validate(struct nv40_context *nv40)
+nv40_state_viewport_validate(struct nvfx_context *nvfx)
 {
-	struct pipe_viewport_state *vpt = &nv40->viewport;
+	struct pipe_viewport_state *vpt = &nvfx->viewport;
 	struct nouveau_stateobj *so;
 
-	if (nv40->state.hw[NV40_STATE_VIEWPORT] &&
-	    !(nv40->dirty & NV40_NEW_VIEWPORT))
+	if (nvfx->state.hw[NVFX_STATE_VIEWPORT] &&
+	    !(nvfx->dirty & NVFX_NEW_VIEWPORT))
 		return FALSE;
 
 	so = so_new(2, 9, 0);
-	so_method(so, nv40->screen->eng3d,
+	so_method(so, nvfx->screen->eng3d,
 		  NV34TCL_VIEWPORT_TRANSLATE_X, 8);
 	so_data  (so, fui(vpt->translate[0]));
 	so_data  (so, fui(vpt->translate[1]));
@@ -21,18 +21,18 @@ nv40_state_viewport_validate(struct nv40_context *nv40)
 	so_data  (so, fui(vpt->scale[1]));
 	so_data  (so, fui(vpt->scale[2]));
 	so_data  (so, fui(vpt->scale[3]));
-	so_method(so, nv40->screen->eng3d, 0x1d78, 1);
+	so_method(so, nvfx->screen->eng3d, 0x1d78, 1);
 	so_data  (so, 1);
 
-	so_ref(so, &nv40->state.hw[NV40_STATE_VIEWPORT]);
+	so_ref(so, &nvfx->state.hw[NVFX_STATE_VIEWPORT]);
 	so_ref(NULL, &so);
 	return TRUE;
 }
 
-struct nv40_state_entry nv40_state_viewport = {
+struct nvfx_state_entry nv40_state_viewport = {
 	.validate = nv40_state_viewport_validate,
 	.dirty = {
-		.pipe = NV40_NEW_VIEWPORT | NV40_NEW_RAST,
-		.hw = NV40_STATE_VIEWPORT
+		.pipe = NVFX_NEW_VIEWPORT | NVFX_NEW_RAST,
+		.hw = NVFX_STATE_VIEWPORT
 	}
 };