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

[mesa.git] / src / gallium / drivers / nv40 / nv40_state_rasterizer.c

diff --git a/src/gallium/drivers/nv40/nv40_state_rasterizer.c b/src/gallium/drivers/nv40/nv40_state_rasterizer.c
index 9ecda5990f0c6a69acfc04c25712b54185e48d95..d6136a26ebe2f6c0f311d35d4f0268219032deff 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_state_rasterizer.c
+++ b/src/gallium/drivers/nv40/nv40_state_rasterizer.c
@@ -1,17 +1,17 @@
 #include "nv40_context.h"
 
 static boolean
-nv40_state_rasterizer_validate(struct nv40_context *nv40)
+nv40_state_rasterizer_validate(struct nvfx_context *nvfx)
 {
-       so_ref(nv40->rasterizer->so,
-              &nv40->state.hw[NV40_STATE_RAST]);
+       so_ref(nvfx->rasterizer->so,
+              &nvfx->state.hw[NVFX_STATE_RAST]);
        return TRUE;
 }
 
-struct nv40_state_entry nv40_state_rasterizer = {
+struct nvfx_state_entry nv40_state_rasterizer = {
        .validate = nv40_state_rasterizer_validate,
        .dirty = {
-               .pipe = NV40_NEW_RAST,
-               .hw = NV40_STATE_RAST
+               .pipe = NVFX_NEW_RAST,
+               .hw = NVFX_STATE_RAST
        }
 };