AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nv50: avoid a NULL-ptr dereference when the pipe context changes

Browse Source 
- We cannot assume all state objects are present when the pipe context changes.
This commit is contained in:
Maarten Maathuis
2009-08-14 22:25:04 +02:00
parent a2af40b846
commit a7adb85827
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/nv50/nv50_state_validate.c
+26 -1
View File
@@ -148,7 +148,32 @@ nv50_state_emit(struct nv50_context *nv50)
struct nouveau_channel *chan = screen->base.channel;
if (nv50->pctx_id != screen->cur_pctx) {
nv50->state.dirty |= 0xffffffff;
if (nv50->state.fb)
nv50->state.dirty |= NV50_NEW_FRAMEBUFFER;
if (nv50->state.blend)
nv50->state.dirty |= NV50_NEW_BLEND;
if (nv50->state.zsa)
nv50->state.dirty |= NV50_NEW_ZSA;
if (nv50->state.vertprog)
nv50->state.dirty |= NV50_NEW_VERTPROG;
if (nv50->state.fragprog)
nv50->state.dirty |= NV50_NEW_FRAGPROG;
if (nv50->state.rast)
nv50->state.dirty |= NV50_NEW_RASTERIZER;
if (nv50->state.blend_colour)
nv50->state.dirty |= NV50_NEW_BLEND_COLOUR;
if (nv50->state.stipple)
nv50->state.dirty |= NV50_NEW_STIPPLE;
if (nv50->state.scissor)
nv50->state.dirty |= NV50_NEW_SCISSOR;
if (nv50->state.viewport)
nv50->state.dirty |= NV50_NEW_VIEWPORT;
if (nv50->state.tsc_upload)
nv50->state.dirty |= NV50_NEW_SAMPLER;
if (nv50->state.tic_upload)
nv50->state.dirty |= NV50_NEW_TEXTURE;
if (nv50->state.vtxfmt && nv50->state.vtxbuf)
nv50->state.dirty |= NV50_NEW_ARRAYS;
screen->cur_pctx = nv50->pctx_id;
}