X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fnv40%2Fnv40_state_scissor.c;h=753a505e934b13881a903960d4a10abeac4a9790;hp=09ffc49f965a39ebf877a245fbabffcb1bb37677;hb=2657325c4a73a2bfa94888a936d06466000e7fbf;hpb=026e2fd3c6eb87a010a9c90341e8a77b09376b5b

diff --git a/src/gallium/drivers/nv40/nv40_state_scissor.c b/src/gallium/drivers/nv40/nv40_state_scissor.c
index 09ffc49f965..753a505e934 100644
--- a/src/gallium/drivers/nv40/nv40_state_scissor.c
+++ b/src/gallium/drivers/nv40/nv40_state_scissor.c
@@ -10,10 +10,11 @@ nv40_state_scissor_validate(struct nv40_context *nv40)
 	if (nv40->state.hw[NV40_STATE_SCISSOR] &&
 	    (rast->scissor == 0 && nv40->state.scissor_enabled == 0))
 		return FALSE;
+	nv40->state.scissor_enabled = rast->scissor;
 
-	so = so_new(3, 0);
-	so_method(so, nv40->hw->curie, NV40TCL_SCISSOR_HORIZ, 2);
-	if (rast->scissor) {
+	so = so_new(1, 2, 0);
+	so_method(so, nv40->screen->curie, NV40TCL_SCISSOR_HORIZ, 2);
+	if (nv40->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,6 +23,7 @@ nv40_state_scissor_validate(struct nv40_context *nv40)
 	}
 
 	so_ref(so, &nv40->state.hw[NV40_STATE_SCISSOR]);
+	so_ref(NULL, &so);
 	return TRUE;
 }