diff options
| author | Roy Spliet <[email protected]> | 2012-05-12 03:42:30 +0200 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2012-05-12 12:42:47 +1000 |
| commit | 897d2351322e4c516eee622b3f49eedca7a2e308 (patch) | |
| tree | ae48787ef39d4b1b9a207ab5ca83960bb595c3aa /src/gallium | |
| parent | 666004148353fa46e818772e496f6d09bd979737 (diff) | |
nv30/shader: SSG, LIT only requires one source register
Fixes crashing due to assertion error
Signed-off-by: Roy Spliet <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/nv30/nvfx_fragprog.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nv30/nvfx_vertprog.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv30/nvfx_fragprog.c b/src/gallium/drivers/nv30/nvfx_fragprog.c index 592ad21c6c8..320efbb6925 100644 --- a/src/gallium/drivers/nv30/nvfx_fragprog.c +++ b/src/gallium/drivers/nv30/nvfx_fragprog.c @@ -623,7 +623,7 @@ nvfx_fragprog_parse_instruction(struct nv30_context* nvfx, struct nvfx_fpc *fpc, break; case TGSI_OPCODE_LIT: if(!nvfx->is_nv4x) - nvfx_fp_emit(fpc, arith(sat, LIT_NV30, dst, mask, src[0], src[1], src[2])); + nvfx_fp_emit(fpc, arith(sat, LIT_NV30, dst, mask, src[0], none, none)); else { /* we use FLT_MIN, so that log2 never gives -infinity, and thus multiplication by * specular 0 always gives 0, so that ex2 gives 1, to satisfy the 0^0 = 1 requirement diff --git a/src/gallium/drivers/nv30/nvfx_vertprog.c b/src/gallium/drivers/nv30/nvfx_vertprog.c index 82972b3943c..f41f82d49ed 100644 --- a/src/gallium/drivers/nv30/nvfx_vertprog.c +++ b/src/gallium/drivers/nv30/nvfx_vertprog.c @@ -668,7 +668,7 @@ nvfx_vertprog_parse_instruction(struct nv30_context *nv30, struct nvfx_vpc *vpc, nvfx_vp_emit(vpc, arith(sat, VEC, SNE, dst, mask, src[0], src[1], none)); break; case TGSI_OPCODE_SSG: - nvfx_vp_emit(vpc, arith(sat, VEC, SSG, dst, mask, src[0], src[1], none)); + nvfx_vp_emit(vpc, arith(sat, VEC, SSG, dst, mask, src[0], none, none)); break; case TGSI_OPCODE_STR: nvfx_vp_emit(vpc, arith(sat, VEC, STR, dst, mask, src[0], src[1], none)); |