r300: respect radeon common code fallbacks

[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 09ffc49f965a39ebf877a245fbabffcb1bb37677..753a505e934b13881a903960d4a10abeac4a9790 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->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;
 }