X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgallium%2Fdrivers%2Fnv40%2Fnv40_state_stipple.c;h=b51024ad9b20c293d365a64145177deaa95d6d86;hb=124f5875eae0b914d5c679fec6b25633907ad843;hp=bd163582a39acc17517ba0e24fa5024f524d918e;hpb=f7922db610d05efee0ee8c5f0dadb69e3939482e;p=mesa.git

diff --git a/src/gallium/drivers/nv40/nv40_state_stipple.c b/src/gallium/drivers/nv40/nv40_state_stipple.c
index bd163582a39..b51024ad9b2 100644
--- a/src/gallium/drivers/nv40/nv40_state_stipple.c
+++ b/src/gallium/drivers/nv40/nv40_state_stipple.c
@@ -3,8 +3,8 @@
 static boolean
 nv40_state_stipple_validate(struct nv40_context *nv40)
 {
-	struct pipe_rasterizer_state *rast = &nv40->pipe_state.rasterizer->pipe;
-	struct nouveau_grobj *curie = nv40->hw->curie;
+	struct pipe_rasterizer_state *rast = &nv40->rasterizer->pipe;
+	struct nouveau_grobj *curie = nv40->screen->curie;
 	struct nouveau_stateobj *so;
 
 	if (nv40->state.hw[NV40_STATE_STIPPLE] &&
@@ -19,7 +19,7 @@ nv40_state_stipple_validate(struct nv40_context *nv40)
 		so_data  (so, 1);
 		so_method(so, curie, NV40TCL_POLYGON_STIPPLE_PATTERN(0), 32);
 		for (i = 0; i < 32; i++)
-			so_data(so, nv40->pipe_state.stipple[i]);
+			so_data(so, nv40->stipple[i]);
 	} else {
 		so = so_new(2, 0);
 		so_method(so, curie, NV40TCL_POLYGON_STIPPLE_ENABLE, 1);
@@ -27,7 +27,6 @@ nv40_state_stipple_validate(struct nv40_context *nv40)
 	}
 
 	so_ref(so, &nv40->state.hw[NV40_STATE_STIPPLE]);
-	so_ref(NULL, &so);
 	return TRUE;
 }