nv40: track current scissor enable/disable state

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

diff --git a/src/gallium/drivers/nv40/nv40_state_scissor.c b/src/gallium/drivers/nv40/nv40_state_scissor.c
index 9e9eadc511673536335ad4a1a778745e38e9561e..285239ef419f715e257f91e69b5ed0703f4bc56d 100644 (file)
--- 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 {