i965g: add lots of error checks and early returns

[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 dc7b6d3a9d88f52249be3c637e4935447261c5b6..cf58d33906a9629c134f673ac8aaf6f937ac821f 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_state_scissor.c
+++ b/src/gallium/drivers/nv40/nv40_state_scissor.c
@@ -4,16 +4,17 @@ static boolean
 nv40_state_scissor_validate(struct nv40_context *nv40)
 {
        struct pipe_rasterizer_state *rast = &nv40->rasterizer->pipe;
-       struct pipe_scissor_state *s = &nv40->pipe_state.scissor;
+       struct pipe_scissor_state *s = &nv40->scissor;
        struct nouveau_stateobj *so;
 
        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_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 {