From: Ben Skeggs <skeggsb@gmail.com>
Date: Sun, 30 Mar 2008 20:35:43 +0000 (+1000)
Subject: nv40: track current scissor enable/disable state
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6806519a0b2a8af0c950f71705b02e13876d460f;p=mesa.git

nv40: track current scissor enable/disable state

Not sure how this was forgotten :)  Anyhow, fixes gearbox/bzflag/xmoto,
probably other things that use scissored clears / hit the nasty
clear-with-quad path.
---

diff --git a/src/gallium/drivers/nv40/nv40_state_scissor.c b/src/gallium/drivers/nv40/nv40_state_scissor.c
index 9e9eadc5116..285239ef419 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->screen->curie, NV40TCL_SCISSOR_HORIZ, 2);
-	if (rast->scissor) {
+	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 {