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

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

diff --git a/src/gallium/drivers/nv40/nv40_state_stipple.c b/src/gallium/drivers/nv40/nv40_state_stipple.c
index b51024ad9b20c293d365a64145177deaa95d6d86..e537e08e1d22fb8e5c74f307003d001ec8c51085 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_state_stipple.c
+++ b/src/gallium/drivers/nv40/nv40_state_stipple.c
@@ -1,39 +1,39 @@
 #include "nv40_context.h"
 
 static boolean
-nv40_state_stipple_validate(struct nv40_context *nv40)
+nv40_state_stipple_validate(struct nvfx_context *nvfx)
 {
-       struct pipe_rasterizer_state *rast = &nv40->rasterizer->pipe;
-       struct nouveau_grobj *curie = nv40->screen->curie;
+       struct pipe_rasterizer_state *rast = &nvfx->rasterizer->pipe;
+       struct nouveau_grobj *eng3d = nvfx->screen->eng3d;
        struct nouveau_stateobj *so;
 
-       if (nv40->state.hw[NV40_STATE_STIPPLE] &&
-          (rast->poly_stipple_enable == 0 && nv40->state.stipple_enabled == 0))
+       if (nvfx->state.hw[NVFX_STATE_STIPPLE] &&
+          (rast->poly_stipple_enable == 0 && nvfx->state.stipple_enabled == 0))
                return FALSE;
 
        if (rast->poly_stipple_enable) {
                unsigned i;
 
-               so = so_new(35, 0);
-               so_method(so, curie, NV40TCL_POLYGON_STIPPLE_ENABLE, 1);
+               so = so_new(2, 33, 0);
+               so_method(so, eng3d, NV34TCL_POLYGON_STIPPLE_ENABLE, 1);
                so_data  (so, 1);
-               so_method(so, curie, NV40TCL_POLYGON_STIPPLE_PATTERN(0), 32);
+               so_method(so, eng3d, NV34TCL_POLYGON_STIPPLE_PATTERN(0), 32);
                for (i = 0; i < 32; i++)
-                       so_data(so, nv40->stipple[i]);
+                       so_data(so, nvfx->stipple[i]);
        } else {
-               so = so_new(2, 0);
-               so_method(so, curie, NV40TCL_POLYGON_STIPPLE_ENABLE, 1);
+               so = so_new(1, 1, 0);
+               so_method(so, eng3d, NV34TCL_POLYGON_STIPPLE_ENABLE, 1);
                so_data  (so, 0);
        }
 
-       so_ref(so, &nv40->state.hw[NV40_STATE_STIPPLE]);
+       so_ref(so, &nvfx->state.hw[NVFX_STATE_STIPPLE]);
        return TRUE;
 }
 
-struct nv40_state_entry nv40_state_stipple = {
+struct nvfx_state_entry nv40_state_stipple = {
        .validate = nv40_state_stipple_validate,
        .dirty = {
-               .pipe = NV40_NEW_STIPPLE | NV40_NEW_RAST,
-               .hw = NV40_STATE_STIPPLE,
+               .pipe = NVFX_NEW_STIPPLE | NVFX_NEW_RAST,
+               .hw = NVFX_STATE_STIPPLE,
        }
 };