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

[mesa.git] / src / gallium / drivers / nv30 / nv30_state_stipple.c

diff --git a/src/gallium/drivers/nv30/nv30_state_stipple.c b/src/gallium/drivers/nv30/nv30_state_stipple.c
index 41b42813b496c505aafb1a1271976f3c6c68bbea..eceb0c57f97f888d5829f2ddeb8798752eef9915 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_state_stipple.c
+++ b/src/gallium/drivers/nv30/nv30_state_stipple.c
@@ -1,39 +1,40 @@
 #include "nv30_context.h"
 
 static boolean
-nv30_state_stipple_validate(struct nv30_context *nv30)
+nv30_state_stipple_validate(struct nvfx_context *nvfx)
 {
-       struct pipe_rasterizer_state *rast = &nv30->rasterizer->pipe;
-       struct nouveau_grobj *rankine = nv30->screen->rankine;
+       struct pipe_rasterizer_state *rast = &nvfx->rasterizer->pipe;
+       struct nouveau_grobj *eng3d = nvfx->screen->eng3d;
        struct nouveau_stateobj *so;
 
-       if (nv30->state.hw[NV30_STATE_STIPPLE] &&
-          (rast->poly_stipple_enable == 0 && nv30->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, rankine, NV34TCL_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, rankine, NV34TCL_POLYGON_STIPPLE_PATTERN(0), 32);
+               so_method(so, eng3d, NV34TCL_POLYGON_STIPPLE_PATTERN(0), 32);
                for (i = 0; i < 32; i++)
-                       so_data(so, nv30->stipple[i]);
+                       so_data(so, nvfx->stipple[i]);
        } else {
-               so = so_new(2, 0);
-               so_method(so, rankine, NV34TCL_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, &nv30->state.hw[NV30_STATE_STIPPLE]);
+       so_ref(so, &nvfx->state.hw[NVFX_STATE_STIPPLE]);
+       so_ref(NULL, &so);
        return TRUE;
 }
 
-struct nv30_state_entry nv30_state_stipple = {
+struct nvfx_state_entry nv30_state_stipple = {
        .validate = nv30_state_stipple_validate,
        .dirty = {
-               .pipe = NV30_NEW_STIPPLE | NV30_NEW_RAST,
-               .hw = NV30_STATE_STIPPLE,
+               .pipe = NVFX_NEW_STIPPLE | NVFX_NEW_RAST,
+               .hw = NVFX_STATE_STIPPLE,
        }
 };