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

diff --git a/src/gallium/drivers/nv40/nv40_state_zsa.c b/src/gallium/drivers/nv40/nv40_state_zsa.c
index cb56948a1b..00facd520a 100644
--- a/src/gallium/drivers/nv40/nv40_state_zsa.c
+++ b/src/gallium/drivers/nv40/nv40_state_zsa.c
@@ -1,41 +1,41 @@
 #include "nv40_context.h"
 
 static boolean
-nv40_state_zsa_validate(struct nv40_context *nv40)
+nv40_state_zsa_validate(struct nvfx_context *nvfx)
 {
-	so_ref(nv40->zsa->so,
-	       &nv40->state.hw[NV40_STATE_ZSA]);
+	so_ref(nvfx->zsa->so,
+	       &nvfx->state.hw[NVFX_STATE_ZSA]);
 	return TRUE;
 }
 
-struct nv40_state_entry nv40_state_zsa = {
+struct nvfx_state_entry nv40_state_zsa = {
 	.validate = nv40_state_zsa_validate,
 	.dirty = {
-		.pipe = NV40_NEW_ZSA,
-		.hw = NV40_STATE_ZSA
+		.pipe = NVFX_NEW_ZSA,
+		.hw = NVFX_STATE_ZSA
 	}
 };
 
 static boolean
-nv40_state_sr_validate(struct nv40_context *nv40)
+nv40_state_sr_validate(struct nvfx_context *nvfx)
 {
 	struct nouveau_stateobj *so = so_new(2, 2, 0);
-	struct pipe_stencil_ref *sr = &nv40->stencil_ref;
+	struct pipe_stencil_ref *sr = &nvfx->stencil_ref;
 
-	so_method(so, nv40->screen->eng3d, NV34TCL_STENCIL_FRONT_FUNC_REF, 1);
+	so_method(so, nvfx->screen->eng3d, NV34TCL_STENCIL_FRONT_FUNC_REF, 1);
 	so_data  (so, sr->ref_value[0]);
-	so_method(so, nv40->screen->eng3d, NV34TCL_STENCIL_BACK_FUNC_REF, 1);
+	so_method(so, nvfx->screen->eng3d, NV34TCL_STENCIL_BACK_FUNC_REF, 1);
 	so_data  (so, sr->ref_value[1]);
 
-	so_ref(so, &nv40->state.hw[NV40_STATE_SR]);
+	so_ref(so, &nvfx->state.hw[NVFX_STATE_SR]);
 	so_ref(NULL, &so);
 	return TRUE;
 }
 
-struct nv40_state_entry nv40_state_sr = {
+struct nvfx_state_entry nv40_state_sr = {
 	.validate = nv40_state_sr_validate,
 	.dirty = {
-		.pipe = NV40_NEW_SR,
-		.hw = NV40_STATE_SR
+		.pipe = NVFX_NEW_SR,
+		.hw = NVFX_STATE_SR
 	}
 };