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

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

diff --git a/src/gallium/drivers/nv40/nv40_state_scissor.c b/src/gallium/drivers/nv40/nv40_state_scissor.c
index dcb068d05965ee3240022b23be6c9d7b164caffe..11ec5c0878bf2a2af12b4b64bec0bf3e5138c8af 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_state_scissor.c
+++ b/src/gallium/drivers/nv40/nv40_state_scissor.c
@@ -1,20 +1,20 @@
 #include "nv40_context.h"
 
 static boolean
-nv40_state_scissor_validate(struct nv40_context *nv40)
+nv40_state_scissor_validate(struct nvfx_context *nvfx)
 {
-       struct pipe_rasterizer_state *rast = &nv40->rasterizer->pipe;
-       struct pipe_scissor_state *s = &nv40->scissor;
+       struct pipe_rasterizer_state *rast = &nvfx->rasterizer->pipe;
+       struct pipe_scissor_state *s = &nvfx->scissor;
        struct nouveau_stateobj *so;
 
-       if (nv40->state.hw[NV40_STATE_SCISSOR] &&
-           (rast->scissor == 0 && nv40->state.scissor_enabled == 0))
+       if (nvfx->state.hw[NVFX_STATE_SCISSOR] &&
+           (rast->scissor == 0 && nvfx->state.scissor_enabled == 0))
                return FALSE;
-       nv40->state.scissor_enabled = rast->scissor;
+       nvfx->state.scissor_enabled = rast->scissor;
 
        so = so_new(1, 2, 0);
-       so_method(so, nv40->screen->eng3d, NV34TCL_SCISSOR_HORIZ, 2);
-       if (nv40->state.scissor_enabled) {
+       so_method(so, nvfx->screen->eng3d, NV34TCL_SCISSOR_HORIZ, 2);
+       if (nvfx->state.scissor_enabled) {
                so_data  (so, ((s->maxx - s->minx) << 16) | s->minx);
                so_data  (so, ((s->maxy - s->miny) << 16) | s->miny);
        } else {
@@ -22,15 +22,15 @@ nv40_state_scissor_validate(struct nv40_context *nv40)
                so_data  (so, 4096 << 16);
        }
 
-       so_ref(so, &nv40->state.hw[NV40_STATE_SCISSOR]);
+       so_ref(so, &nvfx->state.hw[NVFX_STATE_SCISSOR]);
        so_ref(NULL, &so);
        return TRUE;
 }
 
-struct nv40_state_entry nv40_state_scissor = {
+struct nvfx_state_entry nv40_state_scissor = {
        .validate = nv40_state_scissor_validate,
        .dirty = {
-               .pipe = NV40_NEW_SCISSOR | NV40_NEW_RAST,
-               .hw = NV40_STATE_SCISSOR
+               .pipe = NVFX_NEW_SCISSOR | NVFX_NEW_RAST,
+               .hw = NVFX_STATE_SCISSOR
        }
 };