diff options
| author | Christoph Bumiller <[email protected]> | 2011-08-27 20:49:36 +0200 |
|---|---|---|
| committer | Christoph Bumiller <[email protected]> | 2011-08-30 13:55:07 +0200 |
| commit | 222b3ea653e5525a4afa57e6a2353335953012d4 (patch) | |
| tree | a0a296f28409108acfdd6830fbc8aefb0e1f55bb /src/gallium/drivers/nvc0/nvc0_surface.c | |
| parent | 9f4998639c3c47f0b7ee3e2a29b7f3609d3f7796 (diff) | |
nv50,nvc0: add states mask to state validation function
This prevents null dereferences in validation of interdependent
state after a switch to a pipe context where we mark all state
as dirty but where not all state is valid / set yet.
Diffstat (limited to 'src/gallium/drivers/nvc0/nvc0_surface.c')
| -rw-r--r-- | src/gallium/drivers/nvc0/nvc0_surface.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gallium/drivers/nvc0/nvc0_surface.c b/src/gallium/drivers/nvc0/nvc0_surface.c index a4fd17e5324..385e2f0268b 100644 --- a/src/gallium/drivers/nvc0/nvc0_surface.c +++ b/src/gallium/drivers/nvc0/nvc0_surface.c @@ -383,12 +383,10 @@ nvc0_clear(struct pipe_context *pipe, unsigned buffers, struct nouveau_channel *chan = nvc0->screen->base.channel; struct pipe_framebuffer_state *fb = &nvc0->framebuffer; unsigned i; - const unsigned dirty = nvc0->dirty; uint32_t mode = 0; /* don't need NEW_BLEND, COLOR_MASK doesn't affect CLEAR_BUFFERS */ - nvc0->dirty &= NVC0_NEW_FRAMEBUFFER; - if (!nvc0_state_validate(nvc0)) + if (!nvc0_state_validate(nvc0, NVC0_NEW_FRAMEBUFFER, 9 + (fb->nr_cbufs * 2))) return; if (buffers & PIPE_CLEAR_COLOR && fb->nr_cbufs) { @@ -421,8 +419,6 @@ nvc0_clear(struct pipe_context *pipe, unsigned buffers, BEGIN_RING(chan, RING_3D(CLEAR_BUFFERS), 1); OUT_RING (chan, (i << 6) | 0x3c); } - - nvc0->dirty = dirty & ~NVC0_NEW_FRAMEBUFFER; } void |