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

diff --git a/src/gallium/drivers/nv40/nv40_state_blend.c b/src/gallium/drivers/nv40/nv40_state_blend.c
index 83202ec23c..bb06b4888d 100644
--- a/src/gallium/drivers/nv40/nv40_state_blend.c
+++ b/src/gallium/drivers/nv40/nv40_state_blend.c
@@ -1,41 +1,41 @@
 #include "nv40_context.h"
 
 static boolean
-nv40_state_blend_validate(struct nv40_context *nv40)
+nv40_state_blend_validate(struct nvfx_context *nvfx)
 {
-	so_ref(nv40->blend->so, &nv40->state.hw[NV40_STATE_BLEND]);
+	so_ref(nvfx->blend->so, &nvfx->state.hw[NVFX_STATE_BLEND]);
 	return TRUE;
 }
 
-struct nv40_state_entry nv40_state_blend = {
+struct nvfx_state_entry nv40_state_blend = {
 	.validate = nv40_state_blend_validate,
 	.dirty = {
-		.pipe = NV40_NEW_BLEND,
-		.hw = NV40_STATE_BLEND
+		.pipe = NVFX_NEW_BLEND,
+		.hw = NVFX_STATE_BLEND
 	}
 };
 
 static boolean
-nv40_state_blend_colour_validate(struct nv40_context *nv40)
+nv40_state_blend_colour_validate(struct nvfx_context *nvfx)
 {
 	struct nouveau_stateobj *so = so_new(1, 1, 0);
-	struct pipe_blend_color *bcol = &nv40->blend_colour;
+	struct pipe_blend_color *bcol = &nvfx->blend_colour;
 
-	so_method(so, nv40->screen->eng3d, NV34TCL_BLEND_COLOR, 1);
+	so_method(so, nvfx->screen->eng3d, NV34TCL_BLEND_COLOR, 1);
 	so_data  (so, ((float_to_ubyte(bcol->color[3]) << 24) |
 		       (float_to_ubyte(bcol->color[0]) << 16) |
 		       (float_to_ubyte(bcol->color[1]) <<  8) |
 		       (float_to_ubyte(bcol->color[2]) <<  0)));
 
-	so_ref(so, &nv40->state.hw[NV40_STATE_BCOL]);
+	so_ref(so, &nvfx->state.hw[NVFX_STATE_BCOL]);
 	so_ref(NULL, &so);
 	return TRUE;
 }
 
-struct nv40_state_entry nv40_state_blend_colour = {
+struct nvfx_state_entry nv40_state_blend_colour = {
 	.validate = nv40_state_blend_colour_validate,
 	.dirty = {
-		.pipe = NV40_NEW_BCOL,
-		.hw = NV40_STATE_BCOL
+		.pipe = NVFX_NEW_BCOL,
+		.hw = NVFX_STATE_BCOL
 	}
 };