Mesa (master): nvfx: don't crash on empty fragment program
Luca Barbieri
lb at kemper.freedesktop.org
Tue Mar 23 07:42:08 PDT 2010
Module: Mesa
Branch: master
Commit: 83f4c444f4e630fe2bfd17ad750f3f17ceff13f6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=83f4c444f4e630fe2bfd17ad750f3f17ceff13f6
Author: Luca Barbieri <luca at luca-barbieri.com>
Date: Sun Jan 17 22:27:53 2010 +0100
nvfx: don't crash on empty fragment program
---
src/gallium/drivers/nvfx/nvfx_fragprog.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/gallium/drivers/nvfx/nvfx_fragprog.c b/src/gallium/drivers/nvfx/nvfx_fragprog.c
index 7635143..b9c91ce 100644
--- a/src/gallium/drivers/nvfx/nvfx_fragprog.c
+++ b/src/gallium/drivers/nvfx/nvfx_fragprog.c
@@ -803,7 +803,8 @@ nvfx_fragprog_translate(struct nvfx_context *nvfx,
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;
More information about the mesa-commit
mailing list