Luca Barbieri
2010-Jan-17 21:35 UTC
[Nouveau] [PATCH 1/2] nv40: don't crash on empty fragment program
--- src/gallium/drivers/nv40/nv40_fragprog.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/gallium/drivers/nv40/nv40_fragprog.c b/src/gallium/drivers/nv40/nv40_fragprog.c index 1237066..209d211 100644 --- a/src/gallium/drivers/nv40/nv40_fragprog.c +++ b/src/gallium/drivers/nv40/nv40_fragprog.c @@ -843,7 +843,8 @@ nv40_fragprog_translate(struct nv40_context *nv40, fp->fp_control |= fpc->num_regs << NV40TCL_FP_CONTROL_TEMP_COUNT_SHIFT; /* Terminate final instruction */ - fp->insn[fpc->inst_offset] |= 0x00000001; + if(fp->insn) + fp->insn[fpc->inst_offset] |= 0x00000001; /* Append NOP + END instruction, may or may not be necessary. */ fpc->inst_offset = fp->insn_len; -- 1.6.3.3
Luca Barbieri
2010-Jan-17 21:36 UTC
[Nouveau] [PATCH 2/2] st: don't assert on empty fragment program
Sauerbraten triggers this assert. --- src/mesa/state_tracker/st_atom_shader.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c index 176f3ea..fce533a 100644 --- a/src/mesa/state_tracker/st_atom_shader.c +++ b/src/mesa/state_tracker/st_atom_shader.c @@ -79,8 +79,6 @@ translate_fp(struct st_context *st, stfp->num_input_slots = numIn; - assert(stfp->Base.Base.NumInstructions > 1); - st_translate_fragment_program(st, stfp, stfp->input_to_slot); } } -- 1.6.3.3
Apparently Analagous Threads
- [PATCH 1/2] Unreference state/buffer objects on context/screen destruction
- Clean up of nv40_context->state.hw and nv40_screen->state
- Backup Question?
- [PATCH 1/3] nv50: remove vtxbuf stateobject after a referenced vtxbuf is mapped
- [Bug 102349] New: nv4x crashing with plasmashell - gdb log included